From 3e75d0a093bceef24a8e3ace34b7849484393e0d Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 1 Sep 2022 16:20:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug59041,5?=
 =?UTF-8?q?8779?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../split/service/impl/FileSpiltService.java  |  2 +-
 .../impl/FileSplitItemsEOServiceImpl.java     | 38 ++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
index 64e066ab9..44b400025 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSpiltService.java
@@ -2586,7 +2586,7 @@ public class FileSpiltService {
                 String path = splitUrl+"/jero-boot/sys/split/file/getImage?fileUrl="+filepathandname;
                 CosBootUtil.uploadByte(bytev, filepathandname);
                 String imgCon = path;
-                String imgConVal = "<img class=\"wordImg\" src=\"" + path + "\">";
+                String imgConVal = "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\"" + path + "\">";
                 message.getItemsCondi().add(imgConVal);
                 message.setItermsConditions(message.getItermsConditions() + imgConVal);
                 itemsValList.add(getSplitItemsValObject(message.getId(), SplitFilePragraTypeEnum.IMG.getValue(), imgCon, message.getItemsCondi().size(), null));
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 8b487319b..5f0c328d1 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -158,7 +158,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 } else if ("IMG".equals(valEO.getType())) {
                     String imgUrl = valEO.getItemContent();
                     valEO.setItemContent(imgUrl);
-                    valContent = "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">";
+                    valContent = "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ valEO.getItemContent() +"\">";
 //                    valContent = valEO.getItemContent();
                 } else if ("TABLE".equals(valEO.getType())) {
                     valContent = valEO.getItemContent();
@@ -233,7 +233,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 } else if ("IMG".equals(valEO.getType())) {
                     String imgUrl = valEO.getItemContent();
                     valEO.setItemContent(imgUrl);
-                    valContent = "<img class=\"wordImg\" src=\"" + valEO.getItemContent() + "\">";
+                    valContent = "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\"" + valEO.getItemContent() + "\">";
 //                    valContent = valEO.getItemContent();
                 } else if ("TABLE".equals(valEO.getType())) {
                     valContent = valEO.getItemContent();
@@ -1693,7 +1693,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         return mFile;
     }
 
-    private List<Map<String, Object>> read(File file, List<String> dbfieldList, String[] titles, String cut) throws IOException, InvalidFormatException {
+    private List<Map<String, Object>> read(File file, List<String> dbfieldList, String[] titles, String cut) throws Exception {
 
         //最终返回数据
         List<Map<String, Object>> list = new ArrayList<>();
@@ -1744,10 +1744,38 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }
             }
         }
+        Row rowDescription= sheet.getRow(1);
+        if (rowDescription != null) {
+            Cell cell = rowDescription.getCell(0);
+            if(ObjectUtil.isNotNull(cell)){
+                //设置单元格类型
+                cell.setCellType(CellType.STRING);
+                String cellValue = cell.getStringCellValue();
+                if(!cellValue.contains("填写说明")){
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        throw new JeroBootException("请导入正确模板!");
+                    } else {
+                        throw new JeroBootException("Please import the correct template");
+                    }
+                }
+            } else{
+                if(CutEnum.CN.getValue().equals(cut)){
+                    throw new JeroBootException("请导入正确模板!");
+                } else {
+                    throw new JeroBootException("Please import the correct template");
+                }
+            }
+        }else{
+            if(CutEnum.CN.getValue().equals(cut)){
+                throw new JeroBootException("请导入正确模板!");
+            } else {
+                throw new JeroBootException("Please import the correct template");
+            }
+        }
 
         Map<String, Object> map = null;
         //获得所有数据
-        //从第x行开始获取
+        //从第3行开始获取，第一行是表头，第二行是填写说明
         for (int x = 2; x <= totalRowNum; x++) {
             map = new HashMap<String, Object>();
             //获得第i行对象
@@ -2461,7 +2489,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 if ("TEXT".equals(valEO.getType())) {
                     valContent += "<p>" + valEO.getItemContent() + "</p>";
                 } else if ("IMG".equals(valEO.getType())) {
-                    valContent += "<img class=\"wordImg\" src=\""+ valEO.getItemContent() +"\">";
+                    valContent += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ valEO.getItemContent() +"\">";
 //                    valContent += valEO.getItemContent();
                 } else if ("TABLE".equals(valEO.getType())) {
                     valContent += valEO.getItemContent();