diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java index 08b322e6..ee6da55b 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/controller/DocumentSplitController.java @@ -2,9 +2,9 @@ package com.jero.modules.laws.documenttool.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.util.MessageUtils; -import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.documenttool.entity.DocumentSplitInfo; import com.jero.modules.laws.documenttool.entity.LawsDocumentSplitView; import com.jero.modules.laws.documenttool.service.IDocumentSplitService; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java index baa95767..9dad83cf 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java @@ -303,7 +303,7 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService { int count = fileSpiltService.fileCHN(sarFileSplitInfoEO, SplitFileTypeTypeEnum.GBT); if(count == -1){ - if(LanguageEnum.CN.equals(MessageUtils.getLanguage())) { + if(LanguageEnum.CN.getValue().equals(MessageUtils.getLanguage().getValue())) { throw new JeroBootException("文档格式错误,请检查文档内容!"); }else{ throw new JeroBootException("The document format is wrong. Please check the document content!"); 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 0127c680..e38edc4f 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 @@ -17,10 +17,7 @@ import com.jero.common.constant.enums.ModuleEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; -import com.jero.common.util.DateUtils; -import com.jero.common.util.MinioUtil; -import com.jero.common.util.UUIDUtils; -import com.jero.common.util.oConvertUtils; +import com.jero.common.util.*; import com.jero.generater.modules.online.cgform.entity.OnlCgformField; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.document.enums.FieldTypeEnum; @@ -1505,7 +1502,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(LanguageEnum.CN.getValue().equals(cut)){ + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){ resultMsg = "压缩包根目录下仅能存在一个excel为导入数据"; }else{ resultMsg = "Only one Excel file can be imported in the compressed package root directory"; @@ -1632,7 +1629,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl treeNameList = new ArrayList<>(); //普通数据字典 List itemNameList = new ArrayList<>(); - if (LanguageEnum.CN.getValue().equals(cut)) { + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); - } else if(LanguageEnum.EN.getValue().equals(cut)){ + } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())){ treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); } @@ -1983,7 +1980,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " can not be more than " + dbLength + " char;"; @@ -2035,7 +2032,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { String finalLastValue = lastValue; collect = categoryList.stream().filter(e -> e.getName().equals(finalLastValue)).collect(Collectors.toList()); - } else if(LanguageEnum.EN.getValue().equals(cut)) { + } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) { String finalLastValue1 = lastValue; collect = categoryList.stream().filter(e -> e.getEnName().equals(finalLastValue1)).collect(Collectors.toList()); } @@ -2086,7 +2083,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2107,7 +2104,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2148,7 +2145,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); - } else if(LanguageEnum.EN.getValue().equals(cut)) { + } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); } if (collect.size() != 0) { @@ -2182,7 +2179,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2203,7 +2200,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); - } else if(LanguageEnum.EN.getValue().equals(cut)) { + } else if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); } valueId += collect.get(0).getItemValue() + ","; @@ -2236,7 +2233,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2327,7 +2324,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); if (nowFileList.size() == 0) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "压缩包中没有" + fileName + "文件; "; } else { errorMsg += fieldName + " " + fileName + "isn't present in the cabinet;"; @@ -2358,7 +2355,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(LanguageEnum.CN.getValue().equals(cut)) { + if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { errorMsg += fieldName + "不能超过" + dbLength + "个字符;"; } else { errorMsg += fieldName + " Can not be more than" + dbLength + "char;"; @@ -2384,7 +2381,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); for(int u=0 ; u itemText = new ArrayList<>(); - if (LanguageEnum.CN.getValue().equals(cut)) { + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); } else { itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); @@ -2967,7 +2964,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl idList = Arrays.asList(value.split(",")); List sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); - if (LanguageEnum.CN.getValue().equals(cut)) { + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); entry.setValue(StringUtils.join(nameList, ",")); } else { @@ -3030,7 +3027,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl itemText = new ArrayList<>(); - if (LanguageEnum.CN.getValue().equals(cut)) { + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); } else { itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); @@ -3041,7 +3038,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl idList = Arrays.asList(value.split(",")); List sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); - if (LanguageEnum.CN.getValue().equals(cut)) { + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())) { List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); entry.setValue(StringUtils.join(nameList, ",")); } else { @@ -3108,7 +3105,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl fieldListSelect = fieldList.stream().filter(v -> YesOrNoEnum.YES.getValue() .equals(String.valueOf(v.getIsShowList()))).collect(Collectors.toList()); List fieldForExport = new ArrayList<>(); - if (LanguageEnum.EN.getValue().equals(cut)){ + if (MessageUtils.getLanguage().getValue().equals(LanguageEnum.EN.getValue())){ fieldForExport = fieldListSelect.stream().map(LawsTag::getDbFieldEnName).collect(Collectors.toList()); } else { fieldForExport = fieldListSelect.stream().map(LawsTag::getDbFieldTxt).collect(Collectors.toList()); @@ -3862,7 +3859,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl