From 79818d99d38f3fb1380e2ee282359b4a88a2a142 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 1 Aug 2024 14:08:05 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AF=91=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/SarFileSplitItemsVal.java          |   5 +
 .../mapper/xml/DocumentSplitMapper.xml        |  10 +-
 .../split/entity/SarFileSplitItemsValEO.java  |   5 +
 .../xml/SarFileSplitItemsValEOMapper.xml      |  15 +-
 .../impl/FileSplitItemsEOServiceImpl.java     | 203 +++++++++---------
 5 files changed, 124 insertions(+), 114 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitItemsVal.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitItemsVal.java
index 5d37916b..849c9bc5 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitItemsVal.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/entity/SarFileSplitItemsVal.java
@@ -40,6 +40,11 @@ public class SarFileSplitItemsVal implements Serializable {
      */
     @ApiModelProperty("条目内容")
     private String itemContent;
+    /**
+     * 译文
+     */
+    @ApiModelProperty("译文")
+    private String translation;
     /**
      * 排序
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 015e7106..41223719 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -40,10 +40,10 @@
     </insert>
 
     <insert id="insertSarFileSplitItemsVal">
-        insert into sar_file_split_items_val(id, sys_org_code, item_id, type, item_content, display_seq, valid_flag, img_name, index_item, creation_time, modify_user, modify_time, creation_user)
+        insert into sar_file_split_items_val(id, sys_org_code, item_id, type, item_content, translation, display_seq, valid_flag, img_name, index_item, creation_time, modify_user, modify_time, creation_user)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.id}, #{entity.sysOrgCode}, #{entity.itemId}, #{entity.type}, #{entity.itemContent}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.imgName}, #{entity.indexItem}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}, #{entity.creationUser})
+            (#{entity.id}, #{entity.sysOrgCode}, #{entity.itemId}, #{entity.type}, #{entity.itemContent}, #{entity.translation}, #{entity.displaySeq}, #{entity.validFlag}, #{entity.imgName}, #{entity.indexItem}, #{entity.creationTime}, #{entity.modifyUser}, #{entity.modifyTime}, #{entity.creationUser})
         </foreach>
     </insert>
 
@@ -139,7 +139,7 @@
     </select>
 
     <select id="queryItemsValByItemIds" resultType="com.jero.modules.split.entity.SarFileSplitItemsValEO">
-        select id, type, item_id, item_content, valid_flag, creation_user,
+        select id, type, item_id, item_content, translation, valid_flag, creation_user,
                creation_time, modify_time, modify_user, display_seq,img_name,index_item
         from SAR_FILE_SPLIT_ITEMS_VAL
         where valid_flag = '0' and ITEM_ID in
@@ -150,7 +150,7 @@
     </select>
 
     <select id="queryItemsValByItemId" resultType="com.jero.modules.split.entity.SarFileSplitItemsValEO">
-        select id, type, item_id, item_content, valid_flag, creation_user,
+        select id, type, item_id, item_content, translation, valid_flag, creation_user,
         creation_time, modify_time, modify_user, display_seq,img_name,index_item
         from SAR_FILE_SPLIT_ITEMS_VAL
         where valid_flag = '0' and ITEM_ID = #{itemId}
@@ -194,7 +194,7 @@
 
     <select id="querySarFileSplitItemsValByItemId"
             resultType="com.jero.modules.laws.documenttool.entity.SarFileSplitItemsVal">
-        select id, sys_org_code, item_id, type, item_content, display_seq, valid_flag,
+        select id, sys_org_code, item_id, type, item_content, translation, display_seq, valid_flag,
                img_name, index_item, creation_time, modify_user, modify_time, creation_user
         from sar_file_split_items_val
         where valid_flag = 0 and item_id = #{itemId}
diff --git a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java
index fc0ef843..5a22bb90 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitItemsValEO.java
@@ -39,6 +39,11 @@ public class SarFileSplitItemsValEO implements Serializable {
      */
     @ApiModelProperty("条文内容")
     private String itemContent;
+    /**
+     * 译文
+     */
+    @ApiModelProperty("译文")
+    private String translation;
     /**
      * 有效标识
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml
index a4fec6fc..940722c8 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/split/mapper/xml/SarFileSplitItemsValEOMapper.xml
@@ -7,6 +7,7 @@
     <result column="type" property="type" />
     <result column="item_id" property="itemId" />
     <result column="item_content" property="itemContent" />
+    <result column="translation" property="translation" />
     <result column="valid_flag" property="validFlag" />
     <result column="creation_user" property="creationUser" />
     <result column="creation_time" property="creationTime" />
@@ -19,7 +20,7 @@
 
   <!-- SAR_FILE_SPLIT_ITEMS_VAL table all fields -->
   <sql id="Base_Column_List" >
-     id, type, item_id, item_content, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq,img_name,index_item
+     id, type, item_id, item_content, translation, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq,img_name,index_item
   </sql>
 
   <!-- 查询条件 -->
@@ -77,7 +78,7 @@
         SELECT SEQ_SAR_FILE_SPLIT_ITEMS_VAL.NEXTVAL FROM DUAL
     </selectKey> -->
     insert into SAR_FILE_SPLIT_ITEMS_VAL(<include refid="Base_Column_List" />)
-    values (#{id, jdbcType=VARCHAR}, #{type, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{itemContent, jdbcType=CLOB}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{displaySeq, jdbcType=INTEGER})
+    values (#{id, jdbcType=VARCHAR}, #{type, jdbcType=VARCHAR}, #{itemId, jdbcType=VARCHAR}, #{itemContent, jdbcType=CLOB}, #{translation, jdbcType=CLOB}, #{validFlag, jdbcType=INTEGER}, #{creationUser, jdbcType=VARCHAR}, #{creationTime, jdbcType=TIMESTAMP}, #{modifyTime, jdbcType=TIMESTAMP}, #{modifyUser, jdbcType=VARCHAR}, #{displaySeq, jdbcType=INTEGER})
   </insert>
 
   <!-- 动态插入记录 主键是序列 -->
@@ -91,6 +92,7 @@
                 <if test="type != null" >type,</if>
                 <if test="itemId != null" >item_id,</if>
                 <if test="itemContent != null" >item_content,</if>
+                <if test="translation != null" >translation,</if>
                 <if test="validFlag != null" >valid_flag,</if>
                 <if test="creationUser != null" >creation_user,</if>
                 <if test="creationTime != null" >creation_time,</if>
@@ -105,6 +107,7 @@
                 <if test="type != null" >#{type, jdbcType=VARCHAR},</if>
                 <if test="itemId != null" >#{itemId, jdbcType=VARCHAR},</if>
                 <if test="itemContent != null" >#{itemContent, jdbcType=CLOB},</if>
+                <if test="translation != null" >#{translation},</if>
                 <if test="validFlag != null" >#{validFlag, jdbcType=INTEGER},</if>
                 <if test="creationUser != null" >#{creationUser, jdbcType=VARCHAR},</if>
                 <if test="creationTime != null" >#{creationTime, jdbcType=TIMESTAMP},</if>
@@ -122,6 +125,7 @@
        set  type = #{type},
             item_id = #{itemId},
             item_content = #{itemContent},
+            translation = #{translation},
             valid_flag = #{validFlag},
             creation_user = #{creationUser},
             creation_time = #{creationTime},
@@ -144,6 +148,9 @@
       <if test="itemContent != null" >
         item_content = #{itemContent},
       </if>
+      <if test="translation != null" >
+          translation = #{translation},
+      </if>
       <if test="validFlag != null" >
         valid_flag = #{validFlag},
       </if>
@@ -226,7 +233,7 @@
     <!--   批量插入接口   -->
     <insert id="insertForeach" parameterType="java.util.List">
         insert into SAR_FILE_SPLIT_ITEMS_VAL
-        (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, index_item)
+        (id, type, item_id, valid_flag, creation_user, creation_time, modify_time, modify_user, display_seq, img_name, item_content, translation, index_item)
         values
         <foreach collection="list" item="item" index="index" separator=",">(
             #{item.id, jdbcType=VARCHAR}, #{item.type, jdbcType=VARCHAR},
@@ -236,6 +243,7 @@
             #{item.modifyUser, jdbcType=VARCHAR}, #{item.displaySeq, jdbcType=INTEGER},
             #{item.imgName, jdbcType=INTEGER},
             #{item.itemContent, jdbcType=CLOB},
+            #{item.translation},
             #{item.indexItem, jdbcType=INTEGER})
         </foreach>
     </insert>
@@ -316,6 +324,7 @@
              item_id,
              type,
              item_content,
+            translation,
              display_seq,
              valid_flag,
              img_name,
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index b92a2f4c..e192a147 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -1436,6 +1436,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 String importDtoId = UUID.randomUUID().toString().replace("-", "");
                 importDto.put("id", importDtoId); // 记得去掉
                 importDto.put("info_id", infoId);
+                String[] valArr = importDto.get("item_content").toString().split("\n");
+                String[] translationArr = importDto.get("translation").toString().split("\n");
+                int j = translationArr.length;
                 List<SarFileSplitItemsValEO> addItemValList = new ArrayList<>();
                 if (addItemsEOList != null && !addItemsEOList.isEmpty()) {
                     Map<String, Object> oldItems = addItemsEOList.get(addItemsEOList.size()-1);
@@ -1447,7 +1450,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         addItemValList = (List<SarFileSplitItemsValEO>) oldItems.get("itemValEOList");
                         String itemContent = oldItems.get("item_content").toString() + importDto.get("item_content").toString();
                         oldItems.put("item_content", itemContent);
-                        String[] valArr = importDto.get("item_content").toString().split("\n");
                         if (valArr != null && valArr.length > 0) {
                             for (int i=0;i<valArr.length;i++) {
                                 SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
@@ -1460,36 +1462,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             valEO.setItemContent(splitTableInfo.getTableHtml());
                                         }
                                     }
+                                    if (i < j) {
+                                        for (SplitTableInfo splitTableInfo1 : getSheetTableList) {
+                                            if (splitTableInfo1.getTableName().equals(translationArr[i])) {
+                                                valEO.setTranslation(splitTableInfo1.getTableHtml());
+                                            }
+                                        }
+                                    }
                                 }
                                 List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
                                 if (nowfilelist != null && !nowfilelist.isEmpty()) {
                                     String url = nowfilelist.get(0).getPath();
                                     MultipartFile multipartFile = createMfileByPath(url);
-                                    String state = "0";
-//                                    String fileSuffix = url.substring(url.lastIndexOf("."));
-//                                    String fileTypeStr = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX,.pdf,.PDF";
-//                                    if (fileTypeStr.contains(fileSuffix)) {
-//                                        state = "1";
-//                                    }
-//                                    OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
-//                                    if(oSSFile!=null){
-//                                        oSSFile = ossFileService.getById(oSSFile.getId());
                                         isText = false;
-
-////                                        BASE64Encoder base64Encoder = new BASE64Encoder();
-////                                        String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
-//                                        String path = oSSFile.getUrl();
-////                                        String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
-////                                        String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
-//                                        valEO.setType("IMG");
-////                                        valEO.setItemContent(imgCon);
-//                                        valEO.setItemContent(path);
-//
-//                                        String imageName = UUIDUtils.randomUUID10() + multipartFile.getName();
-//                                        String filepathandname = uploadCospath + "/" + imageName;
                                         try {
-//                                            String paths = splitUrl+imageName;
-//                MinioUtil.uploadByte(bytev, filepathandname);
                                             String upload = ObsBootUtil.upload(multipartFile, "temp");
                                             OSSFile ossFile = new OSSFile();
                                             ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
@@ -1498,6 +1484,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             ossFileService.save(ossFile);
                                             valEO.setType("IMG");
                                             valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
+                                            if (i < j) {
+                                                List<File> translationfilelist = FileUnZip.readFileByFilename(filepath, translationArr[i]);
+                                                if (CollectionUtil.isNotEmpty(translationfilelist)) {
+                                                    String urlTranslation = translationfilelist.get(0).getPath();
+                                                    MultipartFile multipartFileTranslation = createMfileByPath(urlTranslation);
+                                                    String uploadTranslation = ObsBootUtil.upload(multipartFileTranslation, "temp");
+                                                    OSSFile ossFileTranslation = new OSSFile();
+                                                    ossFileTranslation.setId(String.valueOf(SnowflakeUtils.snowflake()));
+                                                    ossFileTranslation.setFileName(multipartFileTranslation.getName());
+                                                    ossFileTranslation.setUrl(uploadTranslation);
+                                                    ossFileService.save(ossFileTranslation);
+                                                    valEO.setTranslation(splitUrl+uploadTranslation.replace("temp\\", ""));
+                                                }
+                                            }
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -1506,6 +1506,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 if (isText) {
                                     valEO.setType("TEXT");
                                     valEO.setItemContent(valArr[i]);
+                                    if(i < j){
+                                        valEO.setTranslation(translationArr[i]);
+                                    }
                                 }
                                 addItemValList.add(valEO);
                             }
@@ -1513,7 +1516,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         oldItems.put("itemValEOList", addItemValList);
                     }else {
                         if(ObjectUtil.isNotEmpty(importDto.get("item_content"))) {
-                            String[] valArr = importDto.get("item_content").toString().split("\n");
                             if (valArr != null && valArr.length > 0) {
                                 for (int i = 0; i < valArr.length; i++) {
                                     SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
@@ -1526,36 +1528,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                                 valEO.setItemContent(splitTableInfo.getTableHtml());
                                             }
                                         }
+                                        if (i < j) {
+                                            for (SplitTableInfo splitTableInfo1 : getSheetTableList) {
+                                                if (splitTableInfo1.getTableName().equals(translationArr[i])) {
+                                                    valEO.setTranslation(splitTableInfo1.getTableHtml());
+                                                }
+                                            }
+                                        }
                                     }
                                     List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
                                     if (nowfilelist != null && !nowfilelist.isEmpty()) {
                                         String url = nowfilelist.get(0).getPath();
                                         MultipartFile multipartFile = createMfileByPath(url);
-                                        String state = "0";
-//                                        String fileSuffix = url.substring(url.lastIndexOf("."));
-//                                        String fileTypeStr = ".doc,.DOC,.docx,.DOCX,.xls, .XLS,.xlsx,.XLSX,.pdf,.PDF";
-//                                        if (fileTypeStr.contains(fileSuffix)) {
-//                                            state = "1";
-//                                        }
-//                                        OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null);
-//                                        OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
-//                                        oSSFile = ossFileService.getById(oSSFile.getId());
-//                                        if (oSSFile != null) {
-//                                            oSSFile = ossFileService.getById(oSSFile.getId());
                                             isText = false;
-
-////                                            BASE64Encoder base64Encoder = new BASE64Encoder();
-////                                            String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
-//                                            String path = oSSFile.getUrl();
-////                                            String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
-////                                            String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
-//                                            valEO.setType("IMG");
-////                                        valEO.setItemContent(imgCon);
-//                                            valEO.setItemContent(path);
-//                                        }
                                         try {
-//                                            String paths = splitUrl+imageName;
-//                MinioUtil.uploadByte(bytev, filepathandname);
                                             String upload = ObsBootUtil.upload(multipartFile, "temp");
                                             OSSFile ossFile = new OSSFile();
                                             ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
@@ -1564,6 +1550,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             ossFileService.save(ossFile);
                                             valEO.setType("IMG");
                                             valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
+                                            if (i < j) {
+                                                List<File> translationfilelist = FileUnZip.readFileByFilename(filepath, translationArr[i]);
+                                                if (CollectionUtil.isNotEmpty(translationfilelist)) {
+                                                    String urlTranslation = translationfilelist.get(0).getPath();
+                                                    MultipartFile multipartFileTranslation = createMfileByPath(urlTranslation);
+                                                    String uploadTranslation = ObsBootUtil.upload(multipartFileTranslation, "temp");
+                                                    OSSFile ossFileTranslation = new OSSFile();
+                                                    ossFileTranslation.setId(String.valueOf(SnowflakeUtils.snowflake()));
+                                                    ossFileTranslation.setFileName(multipartFileTranslation.getName());
+                                                    ossFileTranslation.setUrl(uploadTranslation);
+                                                    ossFileService.save(ossFileTranslation);
+                                                    valEO.setTranslation(splitUrl+uploadTranslation.replace("temp\\", ""));
+                                                }
+                                            }
                                         } catch (Exception e) {
                                             e.printStackTrace();
                                         }
@@ -1571,6 +1571,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                     if (isText) {
                                         valEO.setType("TEXT");
                                         valEO.setItemContent(valArr[i]);
+                                        if(i < j){
+                                            valEO.setTranslation(translationArr[i]);
+                                        }
                                     }
                                     addItemValList.add(valEO);
                                 }
@@ -1581,7 +1584,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                 } else {
                     if(ObjectUtil.isNotEmpty(importDto.get("item_content"))) {
-                        String[] valArr = importDto.get("item_content").toString().split("\n");
                         if (valArr != null && valArr.length > 0) {
                             for (int i = 0; i < valArr.length; i++) {
                                 SarFileSplitItemsValEO valEO = new SarFileSplitItemsValEO();
@@ -1594,30 +1596,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                             valEO.setItemContent(splitTableInfo.getTableHtml());
                                         }
                                     }
+                                    if (i < j) {
+                                        for (SplitTableInfo splitTableInfo1 : getSheetTableList) {
+                                            if (splitTableInfo1.getTableName().equals(translationArr[i])) {
+                                                valEO.setTranslation(splitTableInfo1.getTableHtml());
+                                            }
+                                        }
+                                    }
                                 }
                                 List<File> nowfilelist = FileUnZip.readFileByFilename(filepath, valArr[i]);
                                 if (nowfilelist != null && !nowfilelist.isEmpty()) {
                                     String url = nowfilelist.get(0).getPath();
                                     MultipartFile multipartFile = createMfileByPath(url);
-                                    String state = "0";
-//                                    OSSFile oSSFile = ossFileService.uploadLocalOfCos(multipartFile, "", state,null);
-//                                    OSSFile oSSFile = ossFileService.uploadLocalForSplit(multipartFile, "",state,null);
-////                                    oSSFile = ossFileService.getById(oSSFile.getId());
-//                                    if (oSSFile != null) {
                                         isText = false;
-
-////                                        BASE64Encoder base64Encoder = new BASE64Encoder();
-////                                        String encode = base64Encoder.encode(oSSFile.getUrl().getBytes(StandardCharsets.UTF_8));
-//                                        String path = oSSFile.getUrl();
-////                                        String path = imgpath + oSSFile.getUrl().substring(oSSFile.getUrl().lastIndexOf(File.separator)+1);
-////                                        String imgCon = "<img class=\"wordImg\" src=\"" + path + "\">";
-//                                        valEO.setType("IMG");
-////                                    valEO.setItemContent(imgCon);
-//                                        valEO.setItemContent(path);
-//                                    }
                                     try {
-//                                            String paths = splitUrl+imageName;
-//                MinioUtil.uploadByte(bytev, filepathandname);
                                         String upload = ObsBootUtil.upload(multipartFile, "temp");
                                         OSSFile ossFile = new OSSFile();
                                         ossFile.setId(String.valueOf(SnowflakeUtils.snowflake()));
@@ -1626,6 +1618,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                         ossFileService.save(ossFile);
                                         valEO.setType("IMG");
                                         valEO.setItemContent(splitUrl+upload.replace("temp\\", ""));
+                                        if (i < j) {
+                                            List<File> translationfilelist = FileUnZip.readFileByFilename(filepath, translationArr[i]);
+                                            if (CollectionUtil.isNotEmpty(translationfilelist)) {
+                                                String urlTranslation = translationfilelist.get(0).getPath();
+                                                MultipartFile multipartFileTranslation = createMfileByPath(urlTranslation);
+                                                String uploadTranslation = ObsBootUtil.upload(multipartFileTranslation, "temp");
+                                                OSSFile ossFileTranslation = new OSSFile();
+                                                ossFileTranslation.setId(String.valueOf(SnowflakeUtils.snowflake()));
+                                                ossFileTranslation.setFileName(multipartFileTranslation.getName());
+                                                ossFileTranslation.setUrl(uploadTranslation);
+                                                ossFileService.save(ossFileTranslation);
+                                                valEO.setTranslation(splitUrl+uploadTranslation.replace("temp\\", ""));
+                                            }
+                                        }
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
@@ -1633,6 +1639,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 if (isText) {
                                     valEO.setType("TEXT");
                                     valEO.setItemContent(valArr[i]);
+                                    if(i < j){
+                                        valEO.setTranslation(translationArr[i]);
+                                    }
                                 }
                                 addItemValList.add(valEO);
                             }
@@ -1658,39 +1667,9 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     //当导入节点没有子节点时，获取当前节点的序号
                     treeListDisplay = targetMenuEO.getDisplaySeq();
                 }
-
-//                if(!"总目录".equals(targetMenuEO.getName())){
-//                    String regex = "^[0-9]{0}([0-9]|[.])+$"; //TODO 待优化：数字和点必须交替
-//                    if(!targetMenuEO.getName().matches(regex)){
-//                        throw  new AdcDaBaseException("所选目录命名不规范");
-//                    }
-//                    String[] str = targetMenuEO.getName().split(".");
-//                    if(str.length == 0){
-//                        levelNum = 2;
-//                    }else {
-//                        levelNum = str.length + 1;
-//                    }
-//                }else{
-//                    levelNum = 1;
-//                }
             }
-
-            //获取导入数据的所有一级节点
-            int finalLevelNum = levelNum;
-            /*List<SarFileSplitItemsEO> itemNumList = new ArrayList<>();
-            for(SarFileSplitItemsEO sarFileSplitItemsEO : addItemsEOList){
-                String[] str = sarFileSplitItemsEO.getItemsNum().split(".");
-                if(str.length == finalLevelNum){
-                    itemNumList.add(sarFileSplitItemsEO);
-                }
-            }*/
-            // 2022-03-31 注释
-//            List<SarFileSplitItemsEO> itemNumList = addItemsEOList.stream()
-//                    .filter(e->e.getItemsNum().split("\\.").length == finalLevelNum || e.getItemsNum().contains("附录"))
-//                    .collect(Collectors.toList());
             //构造目录树
             HashMap<String, String> menuAndItemMap = new HashMap<>();
-//            if(CollectionUtils.isNotEmpty(itemNumList)) {
             List<Map<String, Object>> itemsEOList = new ArrayList<>(addItemsEOList);
             List<SarFileSplitMenuTreeNode> treeList = buildTree(itemsEOList, treeListDisplay, menuId);
 
@@ -1699,9 +1678,6 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             for (SarFileSplitMenuTreeNode treeNode : treeList) {
                 menuAndItemMap.put(treeNode.getItemId(), treeNode.getId());
             }
-//            }else{
-//                throw new AdcDaBaseException("导入目录命名不规范");
-//            }
             //添加条款
             for (Map<String, Object> itemsEO : addItemsEOList) {
                 if(menuAndItemMap.get(itemsEO.get("id")) != null) {
@@ -2950,20 +2926,34 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         //添加val表数据
         List<SarFileSplitItemsValEO> getValList = (List<SarFileSplitItemsValEO>) sarFileSplitItemsEO.get("itemValEOList");
         String itemConditions = "";
+        String itemConditionsTranslation = "";
         int ind = 1;
         if (getValList != null && !getValList.isEmpty()) {
             for (SarFileSplitItemsValEO valEO : getValList) {
+                String type = valEO.getType();
+                String itemContent = valEO.getItemContent();
+                String translation = valEO.getTranslation();
                 // 当前段内容
                 String valContent = "";
-                if ("TEXT".equals(valEO.getType())) {
-                    valContent += "<p>" + valEO.getItemContent() + "</p>";
-                } else if ("IMG".equals(valEO.getType())) {
-                    valContent += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ valEO.getItemContent() +"\">";
-//                    valContent += valEO.getItemContent();
-                } else if ("TABLE".equals(valEO.getType())) {
-                    valContent += valEO.getItemContent();
+                String valContentTranslation = "";
+                if ("TEXT".equals(type)) {
+                    valContent += "<p>" + itemContent + "</p>";
+                    if (StringUtils.isNotBlank(translation)){
+                        valContentTranslation += "<p>" + translation + "</p>";
+                    }
+                } else if ("IMG".equals(type)) {
+                    valContent += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ itemContent +"\">";
+                    if (StringUtils.isNotBlank(translation)){
+                        valContentTranslation += "<img class=\"wordImg\" style=\"width:100%;height:100%\" src=\""+ translation +"\">";
+                    }
+                } else if ("TABLE".equals(type)) {
+                    valContent += itemContent;
+                    if (StringUtils.isNotBlank(translation)){
+                        valContentTranslation += translation;
+                    }
                 }
                 itemConditions += valContent;
+                itemConditionsTranslation += valContentTranslation;
                 // val表信息
                 valEO.setId(UUIDUtils.randomUUID20());
 //                valEO.setItemId(itemsId);
@@ -2978,6 +2968,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             }
             sarFileSplitItemsValEOMapper.insertForeach(getValList);
             sarFileSplitItemsEO.put("item_content", itemConditions);
+            sarFileSplitItemsEO.put("translation", itemConditionsTranslation);
         }
         String id = (String)sarFileSplitItemsEO.get("id");
         sarFileSplitItemsEO.remove("id");