From 1dd93712e3873bf9d4be689f115c964d0703d03f Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Wed, 13 Apr 2022 19:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=86=E5=88=86-=E5=AF=BC=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E8=8B=B1=E6=96=87=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysCategoryServiceImpl.java  |  18 +
 .../impl/FileSplitItemsEOServiceImpl.java     | 400 ++++++++++++++----
 2 files changed, 347 insertions(+), 71 deletions(-)

diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
index 73baf4f08..043b84843 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
@@ -1,5 +1,6 @@
 package com.jero.modules.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -42,6 +43,23 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
 	@Autowired
 	SysCategoryMapper sysCategoryMapper;
 
+	public List<String> getParentPath(SysCategory sysCategory){
+		List<String> nameList = new ArrayList<>();
+		nameList.add(sysCategory.getName());
+		getParent(sysCategory, nameList);
+		return nameList;
+	}
+
+	private List<String> getParent(SysCategory sysCategory, List<String> nameList){
+		SysCategory parent = sysCategoryMapper.selectById(sysCategory.getPid());
+		if(ObjectUtil.isNotEmpty(parent)){
+			nameList.add(parent.getName());
+		}
+		if(!"0".equals(sysCategory.getPid())){
+			getParent(parent, nameList);
+		}
+		return nameList;
+	}
 	@Override
 	public void addSysCategory(SysCategory sysCategory) {
 		String categoryCode = "";
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 792236ad1..7767635b6 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
@@ -1324,11 +1324,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     }
                 }
             }
-            String msg = "成功导入" + countSuccess + "条";
+            String msg = "";
+            if(CutEnum.CN.getValue().equals(cut)){
+                msg = "成功导入" + countSuccess + "条";
+            } else {
+                msg = "import " + countSuccess + " datas successfully";
+            }
             return Result.OK( msg, null);
         } catch (Exception e) {
             log.error(e.getMessage(),e);
-            return Result.error(1,"导入失败");
+            String msg = "";
+            if(CutEnum.CN.getValue().equals(cut)){
+                msg = "导入失败";
+            } else {
+                msg = "import failed";
+            }
+            return Result.error(1,msg);
         }
     }
 
@@ -1339,10 +1350,16 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         int pos = file.getOriginalFilename().lastIndexOf(".");
         String str = file.getOriginalFilename().substring(pos+1).toLowerCase();
         String filenameorg = file.getOriginalFilename().substring(0,pos);
+        String resultMsg = "";
         //判断上传文件必须是zip
         // TODO 允许导入rar
         if (!str.equals("zip")) {
-            return Result.error("请上传zip文件");
+            if(CutEnum.CN.getValue().equals(cut)){
+                resultMsg = "请上传zip文件";
+            }else{
+                resultMsg = "Please upload a zip file";
+            }
+            return Result.error(resultMsg);
         }
         String path = uploadpath + "/modal/"+filenameorg;
         File saveDirectory = new File(path);
@@ -1359,11 +1376,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             if(excelfilelist.size()<1){
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error(1, "压缩包内没有上传Excel数据");
+                if(CutEnum.CN.getValue().equals(cut)){
+                    resultMsg = "压缩包内没有上传Excel数据";
+                }else{
+                    resultMsg = "In the cabinet did not upload the Excel data";
+                }
+                return Result.error(1, resultMsg);
+
             } else if (excelfilelist.size()>1) {
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error(1, "压缩包根目录下仅能存在一个excel为导入数据");
+                if(CutEnum.CN.getValue().equals(cut)){
+                    resultMsg = "压缩包根目录下仅能存在一个excel为导入数据";
+                }else{
+                    resultMsg = "Only one Excel file can be imported in the compressed package root directory";
+                }
+                return Result.error(1, resultMsg);
             }
             File excelfile = excelfilelist.get(0);
             // 导入参数设置，默认即可
@@ -1377,7 +1405,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 String dbfields = getFieldForExport();
                 List<String> dbfieldList = Arrays.asList(dbfields.split(",")); // 有顺序
                 // 解析excel，并返回校验信息
-                result = read(excelfile, dbfieldList,fields);
+                result = read(excelfile, dbfieldList,fields,cut);
                 Long getExcelInfo = System.currentTimeMillis();
                 //excel读取到的数据
                 List<Map<String, Object>> datas = result;
@@ -1426,23 +1454,43 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 }else{
                     //删除原上传文件
                     FileUnZip.deleteDir(saveDirectory);
-                    return Result.error(1, "没有可导入的数据,请检查!");
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        resultMsg = "没有可导入的数据,请检查!";
+                    }else{
+                        resultMsg = "No data to import, please check";
+                    }
+                    return Result.error(1, resultMsg);
                 }
             } catch (NoSuchElementException e){
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error(1, "没有可导入的数据,请检查!");
+                if(CutEnum.CN.getValue().equals(cut)){
+                    resultMsg = "没有可导入的数据,请检查!";
+                }else{
+                    resultMsg = "No data to import, please check";
+                }
+                return Result.error(1, resultMsg);
             } catch (JeroBootException e){
                 FileUnZip.deleteDir(saveDirectory);
                 return Result.error(1, e.getMessage());
             } catch (Exception e) {
                 //删除原上传文件
                 FileUnZip.deleteDir(saveDirectory);
-                return Result.error( 1, "读取失败，请严格按照模板文件导入数据");
+                if(CutEnum.CN.getValue().equals(cut)){
+                    resultMsg = "读取失败，请严格按照模板文件导入数据";
+                }else{
+                    resultMsg = "The data fails to be read. Import data strictly according to the template file";
+                }
+                return Result.error(1, resultMsg);
             }
         } catch (Exception e) {
             //删除原上传文件
             FileUnZip.deleteDir(saveDirectory);
-            return Result.error(1, "读取失败，请严格按照模板文件导入数据");
+            if(CutEnum.CN.getValue().equals(cut)){
+                resultMsg = "读取失败，请严格按照模板文件导入数据";
+            }else{
+                resultMsg = "The data fails to be read. Import data strictly according to the template file";
+            }
+            return Result.error(1, resultMsg);
         }
     }
 
@@ -1497,7 +1545,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         return mFile;
     }
 
-    private List<Map<String, Object>> read(File file, List<String> dbfieldList, String[] titles) throws IOException, InvalidFormatException {
+    private List<Map<String, Object>> read(File file, List<String> dbfieldList, String[] titles, String cut) throws IOException, InvalidFormatException {
 
         //最终返回数据
         List<Map<String, Object>> list = new ArrayList<>();
@@ -1527,13 +1575,25 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                     cell.setCellType(CellType.STRING);
                     String cellValue = cell.getStringCellValue().substring(cell.getStringCellValue().indexOf("*")+1);
                     if(!cellValue.equals(titles[i])){
-                        throw new JeroBootException("请导入正确模板!");
+                        if(CutEnum.CN.getValue().equals(cut)){
+                            throw new JeroBootException("请导入正确模板!");
+                        } else {
+                            throw new JeroBootException("Please import the correct template");
+                        }
                     }
                 } else{
-                    throw new JeroBootException("请导入正确模板!");
+                    if(CutEnum.CN.getValue().equals(cut)){
+                        throw new JeroBootException("请导入正确模板!");
+                    } else {
+                        throw new JeroBootException("Please import the correct template");
+                    }
                 }
             }else{
-                throw new JeroBootException("请导入正确模板!");
+                if(CutEnum.CN.getValue().equals(cut)){
+                    throw new JeroBootException("请导入正确模板!");
+                } else {
+                    throw new JeroBootException("Please import the correct template");
+                }
             }
         }
 
@@ -1667,7 +1727,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         for (Map<String, Object> dto : datas) {
             i++;
             int countError = 0;   //记录失败数据数量
-            String errorMsg = "第" + i + "行：";
+            String errorMsg = "";
+            if(CutEnum.CN.getValue().equals(cut)){
+                errorMsg = "第" + i + "行：";
+            }else{
+                errorMsg = i + " line：";
+            }
             //判断发布日期,新车型实施日期,在产车实施日期
 
 //            try {
@@ -1704,7 +1769,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                 String value = (String) entry.getValue();
                 String field = "";
                 for (Map<String, Object> map : fieldList) {
-                    String fieldName = (String) map.get("db_field_txt");//中文名称
+                    String fieldName = (String) map.get("db_field_txt");//中文名称/英文名称
                     String dbfieldName = (String) map.get("db_field_name");//字段名
                     String mustInput = (String) map.get("field_must_input");//是否必填
                     String dbLength = map.get("db_length").toString();//字段长度
@@ -1717,20 +1782,36 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //树形
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)){
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                }else{
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " can not be more than " + dbLength + " char;";
+                                }
                                 countError++;
                             }
                             //判断数据是否匹配
                             if (StringUtils.isNotBlank(value)) {
                                 value = value.replace("，",",");
                                 for (String valueTemp : value.split(",")) {
-                                    if (!treeNameList.contains(valueTemp)) {
-                                        errorMsg += fieldName + "中的" + valueTemp + "与数据字典不匹配；";
+                                    String lastValue = valueTemp;
+                                    if(valueTemp.contains("/")){
+                                        lastValue = valueTemp.substring(valueTemp.lastIndexOf("/")+1);
+                                    }
+                                    if (!treeNameList.contains(lastValue)) {
+                                        if(CutEnum.CN.getValue().equals(cut)) {
+                                            errorMsg += fieldName + "中的" + lastValue + "与数据字典不匹配；";
+                                        } else {
+                                            errorMsg += fieldName +" "+ lastValue + " does not match the data dictionary;";
+                                        }
                                         countError++;
                                     }
                                 }
@@ -1740,16 +1821,33 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             if (StringUtils.isNotBlank(value)) {
                                 value = value.replace("，",",");
                                 for (String valueTemp : value.split(",")) {
-                                    if (treeNameList.contains(valueTemp)) {
-                                        // TODO 树形结构导入格式 a/b/c 需特殊处理
+                                    String lastValue = valueTemp;
+                                    if(valueTemp.contains("/")){
+                                        lastValue = valueTemp.substring(valueTemp.lastIndexOf("/")+1);
+                                    }
+                                    if (treeNameList.contains(lastValue)) {
                                         List<SysCategory> collect = new ArrayList<>();
                                         if(CutEnum.CN.getValue().equals(cut)) {
-                                            collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList());
+                                            String finalLastValue = lastValue;
+                                            collect = categoryList.stream().filter(e -> e.getName().equals(finalLastValue)).collect(Collectors.toList());
                                         } else if(CutEnum.EN.getValue().equals(cut)) {
-                                            collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList());
+                                            String finalLastValue1 = lastValue;
+                                            collect = categoryList.stream().filter(e -> e.getEnName().equals(finalLastValue1)).collect(Collectors.toList());
                                         }
                                         if (collect.size() != 0) {
-                                            valueIdList.add(collect.get(0).getId());
+                                            if(collect.size() == 1){
+                                                valueIdList.add(collect.get(0).getId());
+                                            } else {
+                                                // TODO 查询子节点的所有父节点
+                                                for(SysCategory sysCategory : collect){
+                                                    List<String> nameList = sysCategoryService.getParentPath(sysCategory);
+                                                    List<String> targetNameList = Arrays.asList(valueTemp.split("/"));
+                                                    if(nameList.size() == targetNameList.size() && targetNameList.containsAll(nameList)) {
+                                                        valueIdList.add(sysCategory.getId());
+                                                        continue;
+                                                    }
+                                                }
+                                            }
                                         }
                                     }
                                 }
@@ -1760,12 +1858,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " can not be more than" + dbLength + "char;";
+                                }
                                 countError++;
                             }
 
@@ -1773,13 +1879,22 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框(数字）
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //正则判断仅能为 负号（-），小数点（.）和数字
                             String regexNumber = "^(\\-|\\+)?\\d+(\\.\\d+)?$";
                             if(StringUtils.isNotBlank(value) && !value.matches(regexNumber)){
-                                errorMsg += fieldName + "仅能为 负号（-），小数点（.）和数字；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "仅能为 负号（-），小数点（.）和数字；";
+
+                                } else {
+                                    errorMsg += fieldName + " only as a minus sign ( - ), dot (. ) and numbers;";
+                                }
                                 countError++;
                             }
 
@@ -1787,23 +1902,39 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //下拉单选
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " can not be more than" + dbLength + "char;";
+                                }
                                 countError++;
                             }
                             //判断是否是单选
                             if (StringUtils.isNotBlank(value) && value.contains(",")) {
-                                errorMsg += fieldName + "为单选项；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为单选项；";
+                                } else {
+                                    errorMsg += fieldName + " is single type;";
+                                }
                                 countError++;
                             }
                             //判断数据是否匹配
                             if (StringUtils.isNotBlank(value)) {
                                 if (!itemNameList.contains(value)) {
-                                    errorMsg += fieldName + "中的" + value + "与数据字典不匹配；";
+                                    if(CutEnum.CN.getValue().equals(cut)) {
+                                        errorMsg += fieldName + "中的" + value + "与数据字典不匹配；";
+                                    } else{
+                                        errorMsg += fieldName + " " + value + " does not match the data dictionary";
+                                    }
                                     countError++;
                                 }
                             }
@@ -1823,12 +1954,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         } else if (FieldTypeEnum.PULL_MORE.getValue().equals(fieldShowType)) {
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " can not be more than" + dbLength + "char;";
+                                }
                                 countError++;
                             }
                             //下拉多选
@@ -1836,7 +1975,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 value = value.replace("，",",");
                                 for (String valueTemp : value.split(",")) {
                                     if (!itemNameList.contains(valueTemp)) {
-                                        errorMsg += fieldName + "中的" + valueTemp + "与数据字典不匹配；";
+                                        if(CutEnum.CN.getValue().equals(cut)) {
+                                            errorMsg += fieldName + "中的" + valueTemp + "与数据字典不匹配；";
+                                        } else{
+                                            errorMsg += fieldName + " " + valueTemp + " does not match the data dictionary";
+                                        }
                                         countError++;
                                     }
                                 }
@@ -1865,18 +2008,30 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //单选日期
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断是否是单日期选择
                             value = value.replace("，",",");
                             if (StringUtils.isNotBlank(value) && value.contains(",")) {
-                                errorMsg += fieldName + "为单日期选项；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为单日期选项；";
+                                } else {
+                                    errorMsg += fieldName + " is single date type;";
+                                }
                                 countError++;
                             }
                             //判断格式是否正确
                             if (!DateUtils.isValidDate((String) value)) {
-                                errorMsg += fieldName + "格式不正确,正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日；";
+                                if(CutEnum.CN.getValue().equals(cut)){
+                                    errorMsg += fieldName + "格式不正确,正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日；";
+                                }else{
+                                    errorMsg += fieldName + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日;";
+                                }
                                 countError++;
                             }
 
@@ -1884,26 +2039,41 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //多选日期
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断格式是否正确
                             if (!DateUtils.isValidDate((String) value)) {
-                                errorMsg += fieldName + "格式不正确,正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日；";
+                                if(CutEnum.CN.getValue().equals(cut)){
+                                    errorMsg += fieldName + "格式不正确,正确格式如:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日；";
+                                }else{
+                                    errorMsg += fieldName + " Incorrect format correct format is:yyyy/m/d、yyyy-MM-dd、yyyy年MM月dd日;";
+                                }
                                 countError++;
                             }
 
-
                         } else if (FieldTypeEnum.FILE.getValue().equals(fieldShowType)) {
                             //文件
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " can not be more than" + dbLength + "char;";
+                                }
                                 countError++;
                             }
                             if (StringUtils.isNotBlank(value)) {
@@ -1912,7 +2082,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 for (String fileName : value.split(",")) {
                                     List<File> nowFileList = FileUnZip.readFileByFilename(filepath, fileName);
                                     if (nowFileList.size() == 0) {
-                                        errorMsg += fieldName + "压缩包中没有" + fileName + "文件; ";
+                                        if(CutEnum.CN.getValue().equals(cut)) {
+                                            errorMsg += fieldName + "压缩包中没有" + fileName + "文件; ";
+                                        } else {
+                                            errorMsg += fieldName + " " + fileName + "isn't present in the cabinet;";
+                                        }
                                         countError++;
                                     } else {
                                         try {
@@ -1939,12 +2113,20 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //标准选择
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += key + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " This parameter is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //判断长度
                             if (StringUtils.isNotBlank(value) && value.length() > Long.parseLong(dbLength)) {
-                                errorMsg += key + "不能超过" + dbLength + "个字符；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "不能超过" + dbLength + "个字符；";
+                                } else {
+                                    errorMsg += fieldName + " Can not be more than" + dbLength + "char;";
+                                }
                                 countError++;
                             }
                             //判断库中是否存在,如果存在则存id,如果不存在则存输入的值
@@ -1975,7 +2157,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //人员选择
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             String regexPerson = "^[\\u4e00-\\u9fa5]{0,}\\([A-Za-z0-9.]*\\)$";
@@ -1985,7 +2171,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 List<String> userIdList = new ArrayList<>();
                                 for(int u=0 ; u<userNames.length; u++){
                                     if(!userNames[u].matches(regexPerson)) {
-                                        errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
+                                        if(CutEnum.CN.getValue().equals(cut)) {
+                                            errorMsg += fieldName + "格式不正确，填写格式：姓名(账号)；";
+                                        } else {
+                                            errorMsg += fieldName + "Not in the correct format, fill in the format:name(account);";
+                                        }
                                         countError++;
                                     }else {
                                         String uName = userNames[u].substring(userNames[u].indexOf("(") + 1, userNames[u].indexOf(")"));
@@ -2002,7 +2192,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             //输入框（链接）
                             //判断是否必填
                             if (IsMustEnum.YES.getValue().equals(mustInput) && StringUtils.isBlank(value)) {
-                                errorMsg += fieldName + "为必填项,不能为空；";
+                                if(CutEnum.CN.getValue().equals(cut)) {
+                                    errorMsg += fieldName + "为必填项,不能为空；";
+                                } else {
+                                    errorMsg += fieldName + " is mandatory and cannot be empty;";
+                                }
                                 countError++;
                             }
                             //正则判断仅能为 负号（-），小数点（.）和数字
@@ -2011,7 +2205,11 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                             if(StringUtils.isNotBlank(value)){
                                 for (String valueTemp : value.split(",")) {
                                     if(!valueTemp.matches(regexLink)) {
-                                        errorMsg += valueTemp + "不是正确的链接格式，必须以http或https开头；";
+                                        if(CutEnum.CN.getValue().equals(cut)) {
+                                            errorMsg += valueTemp + "不是正确的链接格式，必须以http或https开头；";
+                                        } else {
+                                            errorMsg += valueTemp + " is not the correct format, you must start with HTTP or https";
+                                        }
                                         countError++;
                                     }
                                 }
@@ -2037,8 +2235,8 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             map.put("result", false);
             String html = "";
             for (String message : stringMessage) {
-                html += message;
-//                html += message + "</br>";
+//                html += message;
+                html += message + "</br>";
             }
             map.put("message", html);
         }
@@ -2294,6 +2492,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
         List<String> dateSingleList = new LinkedList<>();//单选日期字段
         List<String> dateMoreList = new LinkedList<>();//多选日期字段
         List<String> standardList = new LinkedList<>();//标准选择字段
+        List<String> treeList = new LinkedList<>();//树形结构字段
         for (Map<String, Object> map : addForm) {
             if ("1".equals(map.get("field_must_input"))) {
                 sb.append("*" + map.get("db_field_txt") + ",");
@@ -2325,53 +2524,112 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
             } else if (FieldTypeEnum.STANDARD.getValue().equals(map.get(fieldShowType))) {
                 //标准选择字段
                 standardList.add((String) map.get("db_field_txt"));
+            } else if (FieldTypeEnum.TREE.getValue().equals(map.get(fieldShowType))) {
+                //树形结构字段
+                treeList.add((String) map.get("db_field_txt"));
             }
         }
         String title = sb.substring(0, sb.length() - 1);
 
         //第二行
         StringBuilder sbTwo = new StringBuilder();
-        sbTwo.append("填写说明\n" + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" + "2.所有带*号的字段必须填写\n");
+        if(CutEnum.CN.getValue().equals(cut)){
+            sbTwo.append("填写说明\n" + "1.导入数据从第三行开始,第一行为表头,第二行为填写说明,第三行是正式数据\n" + "2.所有带*号的字段必须填写\n");
+        }else{
+            sbTwo.append("Filling explanation\n"
+                    + "1.Import data starts at the third line, the first line is the header, the second line is the description, and the third line is the official data\n"
+                    + "2.All fields marked with * must be filled in\n");
+        }
         int count = 3;
         if (pullSingleList.size() != 0) {
             //单选
-            String pullSingle = StringUtils.join(pullSingleList, ",") + "字段为单选属性,必须和系统中的对应字段选项相匹配\n";
-            sbTwo.append(count++ + "." + pullSingle);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String pullSingle = StringUtils.join(pullSingleList, ",") + "字段是单选属性,必须和系统中的对应字段选项相匹配\n";
+                sbTwo.append(count++ + "." + pullSingle);
+            }else{
+                String pullSingle = StringUtils.join(pullSingleList, ",") + " fields are single type,Must match the corresponding field option in the system\n";
+                sbTwo.append(count++ + "." + pullSingle);
+            }
         }
         if (textNumberList.size() != 0) {
-            //单选
-            String textNumber = StringUtils.join(textNumberList, ",") + "字段仅能填写数字，负数，小数\n";
-            sbTwo.append(count++ + "." + textNumber);
+            //文本框（数字）
+            if(CutEnum.CN.getValue().equals(cut)) {
+                String textNumber = StringUtils.join(textNumberList, ",") + "字段仅能填写数字，负数，小数\n";
+                sbTwo.append(count++ + "." + textNumber);
+            } else {
+                String textNumber = StringUtils.join(textNumberList, ",") + " fields can only fill in the numbers, negative numbers, fractions\n";
+                sbTwo.append(count++ + "." + textNumber);
+            }
         }
         if (pullMoreList.size() != 0) {
             //多选
-            String pullMore = StringUtils.join(pullMoreList, ",") + "字段为多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n";
-            sbTwo.append(count++ + "." + pullMore);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String pullMore = StringUtils.join(pullMoreList, ",") + "字段是多选属性,必须和系统中的对应字段选项相匹配,填写多个时采用英文或中文逗号分割\n";
+                sbTwo.append(count++ + "." + pullMore);
+            }else{
+                String pullMore = StringUtils.join(pullMoreList, ",") + " fields are multi-select type, must match the corresponding field in the system. If multiple fields are filled in, separate them by commas (,)\n";
+                sbTwo.append(count++ + "." + pullMore);
+            }
         }
         if (dateSingleList.size() != 0) {
             //单选日期
-            String dateSingle = StringUtils.join(dateSingleList, ",") + "字段为日期,必须精确到日\n";
-            sbTwo.append(count++ + "." + dateSingle);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String dateSingle = StringUtils.join(dateSingleList, ",") + "字段为日期,必须精确到日\n";
+                sbTwo.append(count++ + "." + dateSingle);
+            }else{
+                String dateSingle = StringUtils.join(dateSingleList, ",") + " fields are date type, must be exact to the day\n";
+                sbTwo.append(count++ + "." + dateSingle);
+            }
         }
         if (dateMoreList.size() != 0) {
             //多选日期
-            String dateMore = StringUtils.join(dateMoreList, ",") + "字段为日期，必须精确到日，可填写多个，填写多个时采用英文或中文逗号分割\n";
-            sbTwo.append(count++ + "." + dateMore);
+            if(CutEnum.CN.getValue().equals(cut)) {
+                String dateMore = StringUtils.join(dateMoreList, ",") + "字段为日期，必须精确到日，可填写多个，填写多个时采用英文或中文逗号分割\n";
+                sbTwo.append(count++ + "." + dateMore);
+            } else {
+                String dateMore = StringUtils.join(dateMoreList, ",") + " fields are date type, must be accurate to a day, fill in more, fill out multiple commas in English or Chinese segmentation\n";
+                sbTwo.append(count++ + "." + dateMore);
+            }
         }
         if (textStringList.size() != 0) {
             //输入框
-            String textString = StringUtils.join(textStringList, ",") + "字段为文本,填写文本内容\n";
-            sbTwo.append(count++ + "." + textString);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String textString = StringUtils.join(textStringList, ",") + "字段为文本,填写文本内容\n";
+                sbTwo.append(count++ + "." + textString);
+            }else{
+                String textString = StringUtils.join(textStringList, ",") + " fields are text type. Enter the text content\n";
+                sbTwo.append(count++ + "." + textString);
+            }
         }
         if (standardList.size() != 0) {
             //标准选择
-            String standard = StringUtils.join(standardList, ",") + "字段为标准号,填写多个时采用英文或中文逗号分割\n";
-            sbTwo.append(count++ + "." + standard);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String standard = StringUtils.join(standardList, ",") + "字段为标准号,填写多个时采用英文或中文逗号分割\n";
+                sbTwo.append(count++ + "." + standard);
+            }else{
+                String standard = StringUtils.join(standardList, ",") + " fields are standard number type. If you fill in more than one field, separate it with English or Chinese commas\n";
+                sbTwo.append(count++ + "." + standard);
+            }
         }
         if (fileList.size() != 0) {
             //文件
-            String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
-            sbTwo.append(count++ + "." + file);
+            if(CutEnum.CN.getValue().equals(cut)){
+                String file = StringUtils.join(fileList, ",") + "字段为文件属性,填写时需要在本文件同级目录下以标准号为名称建立文件夹,并在文件夹下放置文件,假设在AAA标准号下放置了B.pdf,则应填写AAA/B.pdf\n";
+                sbTwo.append(count++ + "." + file);
+            }else{
+                String file = StringUtils.join(fileList, ",") + " fields are file type, must create a folder in the directory of the same level as the file with the name of the standard number and place the file in the folder. Assume that the file is saved in the AAA standard numberB.pdf,Should fill inAAA/B.pdf\n";
+                sbTwo.append(count++ + "." + file);
+            }
+        }
+        if (treeList.size() != 0) {
+            //树形结构
+            if(CutEnum.CN.getValue().equals(cut)){
+                String tree = StringUtils.join(treeList, ",") + "字段为树形结构,填写的数据每层级间用反斜杠(/)划分,如A/B/C代表A层级下B,B层级下的C\n";
+                sbTwo.append(count++ + "." + tree);
+            }else{
+                String tree = StringUtils.join(treeList, ",") + " fields are tree type,Fill in the data between each level with a backslash ( / ) partition, such as b,b under a/b/c represent a hierarchy level under the C\n";
+                sbTwo.append(count++ + "." + tree);
+            }
         }
         List<String> resultList = new LinkedList<>();
         resultList.add(title);