diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java index 0cddfb350..7bc3a779b 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/controller/BussDocumentLibraryEOController.java @@ -394,9 +394,10 @@ public class BussDocumentLibraryEOController extends JeroController importZip(@RequestParam(value = "file", required = false) MultipartFile file) throws Exception { + public Result importZip(@RequestParam(value = "file", required = false) MultipartFile file, + @RequestParam(value = "cut",required = false) String cut) throws Exception { try { - bussDocumentLibraryEOService.importZip(file); + bussDocumentLibraryEOService.importZip(file,cut); } catch (Exception e) { e.printStackTrace(); return Result.error(e.getMessage()); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java index a41a7923c..6498f9acc 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/IBussDocumentLibraryEOService.java @@ -189,7 +189,7 @@ public interface IBussDocumentLibraryEOService extends IService ids); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index 053c8fd2a..58241e14e 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -2960,8 +2960,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl list = getWorkbookTitle("cn"); int pos = file.getOriginalFilename().lastIndexOf("."); String str = file.getOriginalFilename().substring(pos + 1).toLowerCase(); String filenameorg = file.getOriginalFilename().substring(0, pos); //判断上传文件必须是zip if (!str.equals("zip") && !str.equals("rar")) { - throw new JeroBootException("请上传zip格式的文件或rar格式的文件"); + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("请上传zip格式的文件或rar格式的文件"); + }else{ + throw new JeroBootException("Please upload a zip file or rar file"); + } + } String path = uploadpath + File.separator + "modal" + File.separator + filenameorg + System.currentTimeMillis(); File saveDirectory = new File(path); @@ -3706,7 +3714,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 2) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("压缩包中必须有且仅有一个文件夹,请重新上传"); + }else{ + throw new JeroBootException("There must be only one folder in the compressed package Please upload it again"); + } + } File fileNew = new File(zipEntryName); List fileList = new ArrayList<>(); @@ -3718,11 +3731,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("压缩包根目录下仅能存在一个excel为导入数据,请重新上传"); + }else{ + throw new JeroBootException("Only one Excel file can be imported in the compressed package root directory. Please upload data again"); + } + } // 数据相关处理, @@ -3732,11 +3755,21 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - throw new JeroBootException("压缩包内有多个Excel数据源"); + if(CutEnum.CN.getValue().equals(cut)){ + throw new JeroBootException("压缩包内有多个Excel数据源"); + }else{ + throw new JeroBootException("There are multiple Excel data sources in the zip package"); + } + } File excelfile = excelfilelist.get(0); @@ -3795,7 +3828,12 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl dictItemList = sysDictItemServiceImpl.selectItemsAll(); //表头 List> addForm = getField(ModuleEnum.DOCUMENT_LIBRARY.getValue(), "cn", "add"); - exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory); + exportDatas(dataList, addForm, categoryList, dictItemList, zipEntryName,saveDirectory,cut); //删除原上传文件 FileUnZip.deleteDir(saveDirectory); @@ -3833,7 +3876,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl categoryList, List dictItemList, String zipEntryName, - File saveDirectory) { + File saveDirectory, + String cut) { //树形数据字典 List treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); //普通数据字典 @@ -3845,7 +3889,13 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl mapResult = new HashMap<>(); i++; int countError = 0; //记录失败数据数量 - String errorMsg = "第" + i + "行:"; + String errorMsg = ""; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg = "第" + i + "行:"; + }else{ + errorMsg = i + " line:"; + } + //判断发布日期,新车型实施日期,在产车实施日期 // try { @@ -3895,19 +3945,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char"; + } countError++; } //判断数据是否匹配 if (StringUtils.isNotBlank(value)) { for (String valueTemp : value.split(",")) { if (!treeNameList.contains(valueTemp)) { - errorMsg += key + "中的" + valueTemp + "与数据字典不匹配"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + valueTemp + "与数据字典不匹配"; + }else{ + errorMsg += key +" "+ valueTemp + " Does not match the data dictionary"; + } countError++; } } @@ -3928,12 +3990,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than" + dbLength + "char"; + } countError++; } @@ -3945,23 +4015,40 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than" + dbLength + " char"; + } countError++; } //判断是否是单选 if (StringUtils.isNotBlank(value) && value.contains(",")) { - errorMsg += key + "为单选项"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "为单选项"; + }else{ + errorMsg += key + " Is multiple Choice"; + } + countError++; } //判断数据是否匹配 if (StringUtils.isNotBlank(value)) { if (!itemNameList.contains(value)) { - errorMsg += key + "中的" + value + "与数据字典不匹配"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + value + "与数据字典不匹配"; + }else{ + errorMsg += key + " " + value + " Does not match the data dictionary"; + } countError++; } } @@ -3976,19 +4063,31 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than" + dbLength + " char"; + } countError++; } //下拉多选 if (StringUtils.isNotBlank(value)) { for (String valueTemp : value.split(",")) { if (!itemNameList.contains(valueTemp)) { - errorMsg += key + "中的" + valueTemp + "与数据字典不匹配"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "中的" + valueTemp + "与数据字典不匹配"; + }else{ + errorMsg += key +" "+ valueTemp + " Does not match the data dictionary"; + } countError++; } } @@ -4013,17 +4112,29 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char"; + } countError++; } if (StringUtils.isNotBlank(value)) { @@ -4058,7 +4185,11 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName); if (nowFileList.size() == 0) { - errorMsg += key + "压缩包中没有" + fileName + "文件; "; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "压缩包中没有" + fileName + "文件; "; + }else{ + errorMsg += key + " Not in the zip package" + fileName + "file; "; + } countError++; } else { try { @@ -4085,12 +4216,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - errorMsg += key + "不能超过" + dbLength + "个字符"; + if(CutEnum.CN.getValue().equals(cut)){ + errorMsg += key + "不能超过" + dbLength + "个字符"; + }else{ + errorMsg += key + " Can not be more than " + dbLength + " char"; + } countError++; } //判断库中是否存在,如果存在则存id,如果不存在则存输入的值 @@ -4269,7 +4408,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl字段 value-->关联文件connect_id + * @param -->字段 value-->关联文件connect_id */ public List fileSort(List fieldFileList,List oSSFileAll,Map map){ List result = new LinkedList<>(); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java index b79b8d0db..929856f88 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java @@ -40,6 +40,9 @@ public class DummyInventoryBaseEO implements Serializable { @ApiModelProperty(value = "创建人") private java.lang.String createBy; + @TableField(exist = false) + private java.lang.String createByCn; + /**创建日期*/ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 01d8f4d71..69da10cca 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -134,7 +134,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl sysUserList = userList.stream().filter(e -> createBy.equals(e.getUsername())).collect(Collectors.toList()); if (sysUserList.size() == 1) { - record.setCreateBy(sysUserList.get(0).getRealname()); + record.setCreateByCn(sysUserList.get(0).getRealname()); } //订阅标识 if(dummyReadIdList.contains(record.getId())){