diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java deleted file mode 100644 index fd1ca5a7..00000000 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/CutEnum.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.jero.common.constant.enums; - -/** - * 中英文切换标识 - * @description - * @date 2022/1/21 15:22 - * @auth zhn - */ -public enum CutEnum { - CN("中文","cn"), - EN("英文","en"); - - - String name; - String value; - - private CutEnum(String name, String value) { - this.name = name; - this.value = value; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/LanguageEnum.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/LanguageEnum.java new file mode 100644 index 00000000..a9ef35b7 --- /dev/null +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/enums/LanguageEnum.java @@ -0,0 +1,22 @@ +package com.jero.common.constant.enums; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * 中英文切换标识 + * @description + * @date 2022/1/21 15:22 + * @auth zhn + */ +@Getter +@AllArgsConstructor +public enum LanguageEnum { + /** + * 中文,英文 + */ + CN("cn"), EN("en"); + + String value; + +} diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MessageUtils.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MessageUtils.java index b8f6f0c1..3a64b8fc 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MessageUtils.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/util/MessageUtils.java @@ -1,6 +1,7 @@ package com.jero.common.util; import cn.hutool.extra.spring.SpringUtil; +import com.jero.common.constant.enums.LanguageEnum; import org.springframework.context.MessageSource; import org.springframework.context.i18n.LocaleContextHolder; @@ -15,8 +16,14 @@ public class MessageUtils { * @param args 参数 * @return 获取国际化翻译值 */ - public static String message(String code, Object... args) { + public static String getMessage(String code, Object... args) { MessageSource messageSource = SpringUtil.getBean(MessageSource.class); return messageSource.getMessage(code, args, LocaleContextHolder.getLocale()); } + + public static LanguageEnum getLanguage() { + String language = LocaleContextHolder.getLocale().getLanguage(); + + return LanguageEnum.EN.getValue().equals(language) ? LanguageEnum.EN : LanguageEnum.CN; + } } diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java index 68d47060..73c42cbd 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/oss/service/impl/OSSFileServiceImpl.java @@ -2,7 +2,7 @@ package com.jero.modules.oss.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.CommonUtils; @@ -104,7 +104,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl // long fileSize = mf.getSize() / 1024 / 1024; // String originalFilename = mf.getOriginalFilename(); // if (fileSize >= 100) { -// if (cut.equals(CutEnum.CN.getValue())) { +// if (cut.equals(LanguageEnum.CN.getValue())) { // throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); // } else { // throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); @@ -131,7 +131,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if ("1".equals(state)) { //固定文件 if (!fileTypeStr.contains(fileType)) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf,word,excel类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); @@ -139,7 +139,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl } } else { if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("不能上传" + StringUtils.join(fileSuffixLimits, ",") + "类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Can't upload" + StringUtils.join(fileSuffixLimits, ",") + "type of file Please select the file again！"); @@ -159,7 +159,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl } } if (flag) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/静态图片类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/Static image type file. Please re select the file!"); @@ -237,7 +237,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl // long fileSize = mf.getSize() / 1024 / 1024; // String originalFilename = mf.getOriginalFilename(); // if (fileSize >= 100) { -// if (cut.equals(CutEnum.CN.getValue())) { +// if (cut.equals(LanguageEnum.CN.getValue())) { // throw new JeroBootException(originalFilename + "文件大小超出100MB, 请压缩或降低文件质量!"); // } else { // throw new JeroBootException(originalFilename + "File size out 100MB, Please compress or reduce file quality!"); @@ -267,7 +267,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl if ("1".equals(state)) { //固定文件 if (!fileTypeStr.contains(fileType)) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf,word,excel类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Only upload pdf,word,excel type of file Please select the file again！"); @@ -278,7 +278,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl List fileTypeStrTwoList = Arrays.asList(fileTypeStrTwo.split(",")); //固定文件 if (!fileTypeStrTwoList.contains(fileType)) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("只能够上传.docx,.DOCX,.xlsx,.XLSX后缀类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Only upload .docx,.DOCX,.xlsx,.XLSX suffix type of file Please select the file again！"); @@ -286,7 +286,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl } } else { if (CommonUtils.limitFileSuffix(orgName, fileSuffixLimits)) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("不能上传" + StringUtils.join(fileSuffixLimits, ",") + "类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Can't upload" + StringUtils.join(fileSuffixLimits, ",") + "type of file Please select the file again！"); @@ -308,7 +308,7 @@ public class OSSFileServiceImpl extends ServiceImpl impl } } if (flag) { - if (cut.equals(CutEnum.CN.getValue())) { + if (cut.equals(LanguageEnum.CN.getValue())) { throw new JeroBootException("只能够上传pdf/word/excel/csv/ppt/txt/zip/rar/msg/gif/静态图片类型的文件。请重新选择文件！"); } else { throw new JeroBootException("Only upload pdf/word/excel/csv/ppt/txt/zip/rar/msg/gif/Static image type file. Please re select the file!"); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java index bb655663..58180264 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.FillRuleConstant; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.util.FillRuleUtil; import com.jero.common.util.oConvertUtils; @@ -257,9 +257,9 @@ public class SysCategoryServiceImpl extends ServiceImpl getSysCategoryTree(String flag, Map params) { - String cut = CutEnum.CN.getValue(); + String cut = LanguageEnum.CN.getValue(); if(params != null){ - cut = ObjectUtil.isNotEmpty(params.get("cut")) ? (String) params.get("cut") : CutEnum.CN.getValue(); + cut = ObjectUtil.isNotEmpty(params.get("cut")) ? (String) params.get("cut") : LanguageEnum.CN.getValue(); } try { //只查询技术领域的technology_territory diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java index f72c69ed..d8b1a65c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDictItemServiceImpl.java @@ -2,7 +2,7 @@ package com.jero.modules.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.modules.system.entity.SysDictItem; import com.jero.modules.system.mapper.SysDictItemMapper; import com.jero.modules.system.service.ISysDictItemService; @@ -189,7 +189,7 @@ public class SysDictItemServiceImpl extends ServiceImpl { boolean flag = false; List fieldValueStrList = Arrays.asList(fieldValues.split(",")); @@ -201,7 +201,7 @@ public class SysDictItemServiceImpl extends ServiceImpl { boolean flag = false; List fieldValueStrList = Arrays.asList(fieldValues.split(",")); @@ -237,7 +237,7 @@ public class SysDictItemServiceImpl extends ServiceImpl { boolean flag = false; List fieldTextStrList = Arrays.asList(fieldTexts.split(",")); @@ -249,7 +249,7 @@ public class SysDictItemServiceImpl extends ServiceImpl { boolean flag = false; List fieldTextStrList = Arrays.asList(fieldTexts.split(",")); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java index a68d7354..6d94545c 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/util/TreeUtils.java @@ -1,6 +1,6 @@ package com.jero.modules.system.util; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.modules.system.entity.SysCategory; import com.jero.modules.system.entity.SysCategoryTreeVO; import org.springframework.stereotype.Component; @@ -30,9 +30,9 @@ public class TreeUtils { sysCategoryTreeVO.setValue(sysCategory.getId()); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); String title = ""; - if(MyStringUtils.equals(cut,CutEnum.CN.getValue())){ + if(MyStringUtils.equals(cut, LanguageEnum.CN.getValue())){ title = sysCategory.getName(); - }else if(MyStringUtils.equals(cut,CutEnum.EN.getValue())){ + }else if(MyStringUtils.equals(cut, LanguageEnum.EN.getValue())){ title = sysCategory.getEnName(); } sysCategoryTreeVO.setTitle(title); @@ -53,9 +53,9 @@ public class TreeUtils { sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); sysCategoryTreeVO.setDictId(sysCategory.getSysDictId()); - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { sysCategoryTreeVO.setTitle(sysCategory.getName()); - } else if (CutEnum.EN.getValue().equals(cut)) { + } else if (LanguageEnum.EN.getValue().equals(cut)) { sysCategoryTreeVO.setTitle(sysCategory.getEnName()); } sysCategoryTreeVO.setParentId(sysCategory.getPid()); @@ -76,9 +76,9 @@ public class TreeUtils { sysCategoryTreeVO.setKey(sysCategory.getId()); sysCategoryTreeVO.setValue(sysCategory.getId()); String title = ""; - if(MyStringUtils.equals(cut,CutEnum.CN.getValue())){ + if(MyStringUtils.equals(cut, LanguageEnum.CN.getValue())){ title = sysCategory.getName(); - }else if(MyStringUtils.equals(cut,CutEnum.EN.getValue())){ + }else if(MyStringUtils.equals(cut, LanguageEnum.EN.getValue())){ title = sysCategory.getEnName(); } sysCategoryTreeVO.setTitle(title); diff --git a/jero-boot-modules/src/main/java/com/jero/modules/activiti/controller/AController.java b/jero-boot-modules/src/main/java/com/jero/modules/activiti/controller/AController.java index d1700234..483f77b0 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/activiti/controller/AController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/activiti/controller/AController.java @@ -2,6 +2,7 @@ package com.jero.modules.activiti.controller; import cn.hutool.core.bean.BeanUtil; import com.jero.common.api.vo.Result; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.service.ProcessService; import io.swagger.annotations.ApiOperation; @@ -19,18 +20,14 @@ import org.activiti.engine.task.TaskQuery; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.AntPathMatcher; +import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.util.CollectionUtils; -import org.springframework.util.PathMatcher; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** @@ -219,8 +216,9 @@ public class AController { } @GetMapping("test") public Result getRedisTest(){ - String msg1 = MessageUtils.message("message"); - String msg2 = MessageUtils.message("message.operate.error","123456"); + String msg1 = MessageUtils.getMessage("message"); + String msg2 = MessageUtils.getMessage("message.operate.error","123456"); + LanguageEnum language = MessageUtils.getLanguage(); return Result.OK(msg1+"\n"+msg2) ; } } diff --git a/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java index de4885f4..b2d97aa9 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/collection/service/impl/OnlCgformCollectionServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; @@ -173,7 +173,7 @@ public class OnlCgformCollectionServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(MyStringUtils.valueOf(e.getIsQuery()))).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ fieldList = fieldList.stream().filter(e->!"title_en".equals(e.getDbFieldName())).collect(Collectors.toList()); }else{ fieldList = fieldList.stream().filter(e->!"title".equals(e.getDbFieldName())).collect(Collectors.toList()); @@ -412,7 +411,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryTree = sysCategoryService.getSysCategoryTree(null,params); List> list = new ArrayList<>(); for (OnlCgformField onlCgformField : fieldList) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ if("title".equals(onlCgformField.getDbFieldName()) || "title_en".equals(onlCgformField.getDbFieldName())){ onlCgformField.setDbFieldTxt("标题"); } @@ -433,7 +432,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl YesOrNoEnum.YES.getValue().equals(MyStringUtils.valueOf(e.getIsShowSearch()))).collect(Collectors.toList()); } else { for (OnlCgformField onlCgformField : fieldList) { - if(CutEnum.EN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){ + if(LanguageEnum.EN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){ onlCgformField.setDbFieldEnName("Title"); break; - } else if(CutEnum.CN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){ + } else if(LanguageEnum.CN.getValue().equals(cut) && "title".equals(onlCgformField.getDbFieldName())){ onlCgformField.setDbFieldTxt("标题"); break; } @@ -567,7 +566,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> Results = new ArrayList<>(); Map mapTemp = new HashMap<>(); String areaName = ""; - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { areaName = onlCgformAreaTemp.getShowArea(); } else { areaName = onlCgformAreaTemp.getEnName(); @@ -643,7 +642,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> Results = new ArrayList<>(); for (OnlCgformArea onlCgformAreaTemp : areaList) { String areaName = ""; - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { areaName = onlCgformAreaTemp.getShowArea(); } else { areaName = onlCgformAreaTemp.getEnName(); @@ -715,7 +714,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fjdssMap = new HashMap<>(); fjdssMap.put("area","文本信息"); - if(StringUtils.equals(cut,CutEnum.CN.getValue())){ + if(StringUtils.equals(cut, LanguageEnum.CN.getValue())){ fjdssMap.put("db_field_txt","分阶段实施详情"); }else { fjdssMap.put("db_field_txt","Details of the phased implementation"); @@ -841,7 +840,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl menuMap1 = new HashMap<>(); // menuMap1.put("pname",areaName); -// if (CutEnum.CN.getValue().equals(cut)) { +// if (LanguageEnum.CN.getValue().equals(cut)) { // menuMap1.put("name",onlCgformField.getDbFieldTxt()); // } else { // menuMap1.put("name",onlCgformField.getDbFieldEnName()); @@ -941,7 +940,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl mapTemp = new HashMap<>(); List> resultTemp = new ArrayList<>(); List fieldListTemp = fieldList.stream().filter(e -> onlCgformAreaTemp.getId().equals(e.getShowArea())).collect(Collectors.toList()); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ fieldListTemp.removeIf(new Predicate() { @Override public boolean test(OnlCgformField onlCgformField) { @@ -1082,7 +1081,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapListTempEn = new ArrayList<>(); StringBuilder fileTextAll = new StringBuilder(); try { - String cutCn = CutEnum.CN.getValue(); - String cutEn = CutEnum.EN.getValue(); + String cutCn = LanguageEnum.CN.getValue(); + String cutEn = LanguageEnum.EN.getValue(); if (ossFileList.size() != 0) { Map mapBaseDateCn = new HashMap<>(); Map mapBaseDateEn = new HashMap<>(); @@ -1913,8 +1912,8 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapListTempEn = new ArrayList<>(); String fileTextAll = ""; try { - String cutCn = CutEnum.CN.getValue(); - String cutEn = CutEnum.EN.getValue(); + String cutCn = LanguageEnum.CN.getValue(); + String cutEn = LanguageEnum.EN.getValue(); if (fileInfos.size() != 0) { //编辑时,有修改文件的情况 fileTextAll = updateEsInfo(map, searchFieldList, sbCn, sbEn, fileInfos, mapListTempCn, mapListTempEn, cutCn, cutEn); @@ -2244,7 +2243,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = stateDictItemList.stream().filter(e -> s.equals(e.getItemValue())).collect(Collectors.toList()); if(collect.size() != 0){ - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ sb.append(collect.get(0).getItemText()+","); }else{ sb.append(collect.get(0).getEnName()+","); @@ -3144,7 +3143,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl state = stateList.stream().filter(e -> e.getItemValue().equals(entry.getValue())).collect(Collectors.toList()); if (state.size() != 0) { - if (CutEnum.CN.getValue().equals((String) parameter.get("cut"))) { + if (LanguageEnum.CN.getValue().equals((String) parameter.get("cut"))) { entry.setValue(state.get(0).getItemText()); } else { entry.setValue(state.get(0).getEnName()); @@ -3212,7 +3211,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl onlCgformFieldList = fieldList.stream().filter(e -> e.getDbFieldName().equals(finalKey)).collect(Collectors.toList()); record1.put("text_info_id", onlCgformFieldList.get(0).getId()); - if (CutEnum.CN.getValue().equals((String) parameter.get("cut"))) { + if (LanguageEnum.CN.getValue().equals((String) parameter.get("cut"))) { record1.put("text_info", onlCgformFieldList.get(0).getDbFieldTxt()); } else { record1.put("text_info", onlCgformFieldList.get(0).getDbFieldEnName()); @@ -3282,7 +3281,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl fileIdLidt = new ArrayList<>(); for (Map record : records) { //处理标题 - if(CutEnum.EN.getValue().equals(cut)){ + if(LanguageEnum.EN.getValue().equals(cut)){ record.put("title",record.get("title_en")); } Map record1 = (Map) record; @@ -3590,9 +3589,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl itemText = new ArrayList<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)) { + } else if(LanguageEnum.EN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); }else if("1".equals(flag)){ itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); @@ -3610,9 +3609,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl itemText = new ArrayList<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)) { + } else if(LanguageEnum.EN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); }else if("2".equals(flagTemp)){ itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); @@ -3668,9 +3667,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl !FieldTypeEnum.FILE.getValue().equals(e.getFieldShowType())).collect(Collectors.toList()); } - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { headerFieldList = fieldListTemp.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList()); } else { headerFieldList = fieldListTemp.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList()); @@ -3906,7 +3905,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map5 = new HashMap<>(); if ("header".equals(flag)) { - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { //编号 map1.put("db_field_name", "serial_number");//字段 map1.put("db_field_txt", "编号");//字段中文名 @@ -4468,7 +4467,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl map4 = new HashMap<>(); if ("header".equals(flag)) { - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { //编号 map1.put("db_field_name", "serial_number");//字段 map1.put("db_field_txt", "编号");//字段中文名 @@ -4551,7 +4550,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); List nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { entry.setValue(StringUtils.join(nameList, ",")); - } else if(CutEnum.EN.getValue().equals(cut)){ + } else if(LanguageEnum.EN.getValue().equals(cut)){ entry.setValue(StringUtils.join(nameEnList, ",")); }else if("1".equals(flag)){ entry.setValue(StringUtils.join(nameEnList, ",")); @@ -4732,9 +4731,9 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl sysCategoryList = categoryList.stream().filter(e -> idList.contains(e.getId())).collect(Collectors.toList()); List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); List nameEnList = sysCategoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { entry.setValue(StringUtils.join(nameList, ",")); - } else if(CutEnum.EN.getValue().equals(cut)){ + } else if(LanguageEnum.EN.getValue().equals(cut)){ entry.setValue(StringUtils.join(nameEnList, ",")); }else if("2".equals(flagTemp)){ entry.setValue(StringUtils.join(nameList, ",")); @@ -4753,7 +4752,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 2) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.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"); @@ -4797,7 +4796,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.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"); @@ -4821,7 +4820,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl 1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ throw new JeroBootException("压缩包内有多个Excel数据源"); }else{ throw new JeroBootException("There are multiple Excel data sources in the zip package"); @@ -4892,7 +4891,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl treeNameList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); }else{ treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); } //普通数据字典 List itemNameList = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); }else{ itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); @@ -4965,7 +4964,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl"); if(phasedImplDetailsArr.length < 3){ - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-必填项不能为空, "; }else{ errorMsg += "Phased Implementation Details - Required items cannot be empty,"; @@ -5000,14 +4999,14 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 1){ String standNumberOrClause = phasedImplDetailsArr[0]; if(StringUtils.isEmpty(standNumberOrClause)){ - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-法规编号/条款不能为空, "; }else{ errorMsg += "Phased Implementation Details - Regulation No./clause cannot be empty,"; } countError++; } else if (StringUtils.isNotBlank(standNumberOrClause) && standNumberOrClause.length() > 200) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-法规编号/条款不能超过" + 200 + "个字符, "; }else{ errorMsg += "Phased Implementation Details - Regulation No./clause Can not be more than " + 200 + " char, "; @@ -5034,7 +5033,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 3){ String implementationDateStr = phasedImplDetailsArr[2]; if(StringUtils.isEmpty(implementationDateStr)){ - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-实施日期不能为空, "; }else{ errorMsg += "Phased Implementation Details - Implementation Date cannot be empty,"; @@ -5069,7 +5068,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= 4){ String remarks = phasedImplDetailsArr[3]; if (StringUtils.isNotBlank(remarks) && remarks.length() > 1000) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += "分阶段实施详情-备注不能超过" + 1000 + "个字符, "; }else{ errorMsg += "Phased Implementation Details - ramarks Can not be more than " + 1000 + " char, "; @@ -5116,7 +5115,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than " + dbLength + " char, "; @@ -5136,7 +5135,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ collect = categoryList.stream().filter(e -> e.getName().equals(valueTemp)).collect(Collectors.toList()); }else{ collect = categoryList.stream().filter(e -> e.getEnName().equals(valueTemp)).collect(Collectors.toList()); @@ -5168,7 +5167,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than" + dbLength + "char, "; @@ -5193,7 +5192,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than" + dbLength + " char, "; @@ -5211,7 +5210,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); }else{ collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); @@ -5246,7 +5245,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than" + dbLength + " char, "; @@ -5266,7 +5265,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); }else{ collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); @@ -5302,7 +5301,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than " + dbLength + " char, "; @@ -5375,7 +5374,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(zipEntryName, fileName,cut,errorMsg,null,key,key); if (nowFileList.size() == 0) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + " 压缩包中没有" + fileName + "文件, "; }else{ errorMsg += key + " Not in the zip package" + fileName + "file, "; @@ -5406,7 +5405,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += key + "不能超过" + dbLength + "个字符, "; }else{ errorMsg += key + " Can not be more than " + dbLength + " char, "; @@ -5661,7 +5660,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl collect = categoryList.stream().filter(e -> e.getId().equals(technologyTerritoryId)).collect(Collectors.toList()); if(collect.size() != 0){ - if(CutEnum.CN.getValue().equals(bussDocumentLibraryEO.getCut())){ + if(LanguageEnum.CN.getValue().equals(bussDocumentLibraryEO.getCut())){ sb.append(collect.get(0).getName()+","); }else{ sb.append(collect.get(0).getEnName()+","); @@ -5741,7 +5740,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl> mapList = this.listMaps(wrapper); String title = ""; if(mapList.size() != 0){ - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ title = mapList.get(0).get("serial_number") + "《"+ mapList.get(0).get("title") + "》"; }else{ title = mapList.get(0).get("serial_number") + "《"+ mapList.get(0).get("title_en") + "》"; diff --git a/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java index eb23b980..b2ba58a1 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/PhasedImplementationDetailsEOServiceImpl.java @@ -1,7 +1,7 @@ package com.jero.modules.document.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.modules.document.entity.PhasedImplementationDetailsEO; import com.jero.modules.document.enums.ImplementationTypeEnum; import com.jero.modules.document.mapper.PhasedImplementationDetailsEOMapper; @@ -119,7 +119,7 @@ public class PhasedImplementationDetailsEOServiceImpl extends ServiceImpl { boolean flag = false; for (String type : implementationTypeArr) { diff --git a/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java b/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java index 2207e92a..58a40e54 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/extRepo/controller/ExtRepoDataController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.MinioUtil; @@ -131,13 +131,13 @@ public class ExtRepoDataController extends JeroController result = new Result(); ExtRepoFolder extRepoFolder = extRepoFolderService.queryById(id); if (extRepoFolder == null) { - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { result.error500("未找到对应数据！"); } else { result.error500("No Data！"); diff --git a/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java b/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java index dde7e2d3..a047355f 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/home/controller/HomeDocumentDynamicEOController.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.query.QueryGenerator; import com.jero.modules.home.entity.HomeDocumentDynamicEO; @@ -61,7 +61,7 @@ public class HomeDocumentDynamicEOController extends JeroController page = new Page(pageNo, pageSize); IPage pageList = homeDocumentDynamicEOService.page(page, queryWrapper); - if(CutEnum.CN.getValue().equals(cut) && ObjectUtils.isNotEmpty(pageList.getRecords())){ + if(LanguageEnum.CN.getValue().equals(cut) && ObjectUtils.isNotEmpty(pageList.getRecords())){ for (HomeDocumentDynamicEO record : pageList.getRecords()) { if(StringUtils.isNotBlank(record.getMsgContentCn())){ record.setMsgContent(record.getMsgContentCn()); diff --git a/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java index fb303628..93244f7a 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/home/service/impl/HomeFunctionModuleEOServiceImpl.java @@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.vo.LoginUser; import com.jero.modules.home.entity.HomeFunctionModuleEO; import com.jero.modules.home.mapper.HomeFunctionModuleEOMapper; @@ -131,7 +131,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl homeFunctionModuleEOS = this.list(wrapperTemp); if(homeFunctionModuleEOS.size() == 0){ - if(CutEnum.EN.getValue().equals(cut)){ + if(LanguageEnum.EN.getValue().equals(cut)){ for (HomeFunctionModuleEO homeFunctionModuleEO : homeFunctionModuleEOListTemp) { homeFunctionModuleEO.setIconName(homeFunctionModuleEO.getIconNameEn()); } @@ -159,7 +159,7 @@ public class HomeFunctionModuleEOServiceImpl extends ServiceImpl> fieldFileList = new ArrayList<>(); for (OnlCgformField field : documentLibraryFieldList) { Map map1 = new HashMap<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { map1.put("label",field.getDbFieldTxt()); map1.put("value",field.getId()); @@ -267,13 +267,13 @@ public class OcrRecordEOServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream() .filter(e->e.getItemValue().equals(ocrRecordEO.getResultContent()) || e.getItemValue().equals(ocrRecordEO.getSyncState())) diff --git a/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java b/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java index 440be3e7..243ce7a9 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/phone/enums/BrowseTypeEnum.java @@ -1,6 +1,6 @@ package com.jero.modules.phone.enums; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import org.apache.commons.lang3.StringUtils; /** @@ -40,7 +40,7 @@ public enum BrowseTypeEnum { BrowseTypeEnum[] values = values(); for (BrowseTypeEnum taskStatusEnum : values) { if (taskStatusEnum.value.equals(value)) { - if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + if (StringUtils.equals(cut, LanguageEnum.CN.getValue())) { return taskStatusEnum.cnName; } else { return taskStatusEnum.enName; diff --git a/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java index f7460954..c4878222 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/SearchCenterServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.es.JeroElasticsearchTemplate; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; @@ -48,7 +48,7 @@ public class SearchCenterServiceImpl implements ISearchCenterService { public Result> getDataCount() { Map result = new HashMap<>(); Map params = new HashMap<>(); - params.put("cut", CutEnum.CN.getValue()); + params.put("cut", LanguageEnum.CN.getValue()); params.put("pageNo", "1"); params.put("pageSize", "10"); IPage documentLibraryInfoPage = this.bussDocumentLibraryEOService.getInfoPage(params); @@ -79,9 +79,9 @@ public class SearchCenterServiceImpl implements ISearchCenterService { String cut = (String) params.get("cut"); Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); - if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + if (StringUtils.equals(cut, LanguageEnum.CN.getValue())) { indexExistsFlag = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_CN.getValue()); - } else if (StringUtils.equals(cut, CutEnum.EN.getValue())) { + } else if (StringUtils.equals(cut, LanguageEnum.EN.getValue())) { indexExistsFlag = jeroElasticsearchTemplate.indexExists(SearchEnum.FULL_TEXT_SEARCH_EN.getValue()); } if (!indexExistsFlag) { @@ -92,9 +92,9 @@ public class SearchCenterServiceImpl implements ISearchCenterService { // 定义需要查询的字段数组 List fieldList = new ArrayList<>(); fieldList.add("serial_number"); - if (StringUtils.equals(cut,CutEnum.EN.getValue())) { + if (StringUtils.equals(cut, LanguageEnum.EN.getValue())) { fieldList.add("title_en"); - } else if (StringUtils.equals(cut,CutEnum.CN.getValue())){ + } else if (StringUtils.equals(cut, LanguageEnum.CN.getValue())){ fieldList.add("title"); } fieldList.add("content"); @@ -209,7 +209,7 @@ public class SearchCenterServiceImpl implements ISearchCenterService { //2. 数据查询 JSONObject search = new JSONObject(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { search = jeroElasticsearchTemplate.search( SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), SearchEnum.FULL_TEXT_SEARCH_CN.getValue(), @@ -245,7 +245,7 @@ public class SearchCenterServiceImpl implements ISearchCenterService { String state_dictText = ""; for (SysDictItem dictItem : stateSysDictItems) { if (StringUtils.equals(dictItem.getItemValue(), state)) { - if (StringUtils.equals(cut, CutEnum.CN.getValue())) { + if (StringUtils.equals(cut, LanguageEnum.CN.getValue())) { state_dictText = dictItem.getItemText(); } else { state_dictText = dictItem.getEnName(); @@ -261,7 +261,7 @@ public class SearchCenterServiceImpl implements ISearchCenterService { } mapSource.put("create_time_str",create_time_str); // 处理中英文切换的时候 展示的标题 - if (StringUtils.equals(cut,CutEnum.EN.getValue())) { + if (StringUtils.equals(cut, LanguageEnum.EN.getValue())) { mapSource.put("title",mapSource.get("title_en")); } mapList.add(mapSource); diff --git a/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java b/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java index 1023a14f..69bbff14 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/split/common/FileUnZip.java @@ -1,6 +1,6 @@ package com.jero.modules.split.common; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.modules.project.entity.ProjectLawsInventoryEO; import com.xkcoding.http.util.StringUtil; import org.apache.commons.lang3.StringUtils; @@ -218,7 +218,7 @@ public class FileUnZip { }else{ name = filename; } - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += nameCn + name + "格式不正确或者压缩包中没有" + name + "文件,请参考模板下载中的说明"; }else{ errorMsg += nameEn + name + " Incorrect format or not present in compressed package " + name + " file please refer to the description in template download;"; @@ -281,7 +281,7 @@ public class FileUnZip { }else{ name = filename; } - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ errorMsg += nameCn + name + "格式不正确或者压缩包中没有" + name + "文件,请参考模板下载中的说明"; }else{ errorMsg += nameEn + name + " Incorrect format or not present in compressed package " + name + " file please refer to the description in template download;"; diff --git a/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java b/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java index daa794df..1aaf28d7 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/split/controller/FileSplitItemsEOController.java @@ -5,7 +5,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.common.util.oConvertUtils; import com.jero.modules.lanswitch.service.ILanguageSwitchService; @@ -323,7 +323,7 @@ public class FileSplitItemsEOController extends JeroController1) { //删除原上传文件 FileUnZip.deleteDir(saveDirectory); - if(CutEnum.CN.getValue().equals(cut)){ + if(LanguageEnum.CN.getValue().equals(cut)){ resultMsg = "压缩包根目录下仅能存在一个excel为导入数据"; }else{ resultMsg = "Only one Excel file can be imported in the compressed package root directory"; @@ -1617,7 +1617,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl treeNameList = new ArrayList<>(); //普通数据字典 List itemNameList = new ArrayList<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { treeNameList = categoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)){ + } else if(LanguageEnum.EN.getValue().equals(cut)){ treeNameList = categoryList.stream().map(SysCategory::getEnName).collect(Collectors.toList()); itemNameList = dictItemList.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); } @@ -1953,7 +1953,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " can not be more than " + dbLength + " char;"; @@ -2005,7 +2005,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { String finalLastValue = lastValue; collect = categoryList.stream().filter(e -> e.getName().equals(finalLastValue)).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)) { + } else if(LanguageEnum.EN.getValue().equals(cut)) { String finalLastValue1 = lastValue; collect = categoryList.stream().filter(e -> e.getEnName().equals(finalLastValue1)).collect(Collectors.toList()); } @@ -2056,7 +2056,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2077,7 +2077,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2118,7 +2118,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(finalValue)).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)) { + } else if(LanguageEnum.EN.getValue().equals(cut)) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(finalValue)).collect(Collectors.toList()); } if (collect.size() != 0) { @@ -2152,7 +2152,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2173,7 +2173,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl collect = new ArrayList<>(); - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getItemText()) && e.getItemText().equals(valueTemp)).collect(Collectors.toList()); - } else if(CutEnum.EN.getValue().equals(cut)) { + } else if(LanguageEnum.EN.getValue().equals(cut)) { collect = dictItemList.stream().filter(e -> StringUtils.isNotBlank(e.getEnName()) && e.getEnName().equals(valueTemp)).collect(Collectors.toList()); } valueId += collect.get(0).getItemValue() + ","; @@ -2206,7 +2206,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " can not be more than" + dbLength + "char;"; @@ -2297,7 +2297,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl nowFileList = FileUnZip.readFileByFilename(filepath, fileName,null,null,null,null,null); if (nowFileList.size() == 0) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "压缩包中没有" + fileName + "文件; "; } else { errorMsg += fieldName + " " + fileName + "isn't present in the cabinet;"; @@ -2328,7 +2328,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl Long.parseLong(dbLength)) { - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { errorMsg += fieldName + "不能超过" + dbLength + "个字符；"; } else { errorMsg += fieldName + " Can not be more than" + dbLength + "char;"; @@ -2354,7 +2354,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl userIdList = new ArrayList<>(); for(int u=0 ; u itemText = new ArrayList<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { itemText = dictItems.stream().map(SysDictItem::getItemText).collect(Collectors.toList()); } else { itemText = dictItems.stream().map(SysDictItem::getEnName).collect(Collectors.toList()); @@ -2937,7 +2937,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 (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { List nameList = sysCategoryList.stream().map(SysCategory::getName).collect(Collectors.toList()); entry.setValue(StringUtils.join(nameList, ",")); } else { @@ -3004,7 +3004,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl fieldForExport = new ArrayList<>(); - if (CutEnum.EN.getValue().equals(cut)){ + if (LanguageEnum.EN.getValue().equals(cut)){ fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldEnName).collect(Collectors.toList()); } else { fieldForExport = fieldList.stream().map(OnlCgformField::getDbFieldTxt).collect(Collectors.toList()); @@ -3718,7 +3718,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl cnMap = dictItemListAll.stream() .filter(e-> e.getItemValue().equals(splitInfoEO.getSplitResult())) .collect(Collectors.toMap(SysDictItem::getItemValue, SysDictItem::getItemText)); // 优化 @@ -353,16 +353,16 @@ public class SarFileSplitInfoServiceImpl extends ServiceImpl 0) { // TODO Cut属性一定能拿到？拿不到的时候显示中文还是英文？现在对吗？测试了吗？ //中英切换提示语 - if(CutEnum.CN.getValue().equals(onlCgformArea.getCut())) { + if(LanguageEnum.CN.getValue().equals(onlCgformArea.getCut())) { return Result.error("同一所属模块下,展示区域名称不能重复！"); }else{ return Result.error("Under the same module, the display area name cannot be duplicate!"); @@ -132,7 +132,7 @@ public class OnlCgformAreaController extends JeroController 0) { //中英切换提示语 // TODO 只改一半？编辑和新增改了，删除不改？ - if(CutEnum.CN.getValue().equals(cut)) { + if(LanguageEnum.CN.getValue().equals(cut)) { return Result.error("该展示区域有关联数据，无法删除！"); }else{ return Result.error("This exhibition area has associated data and cannot be deleted!"); @@ -201,7 +201,7 @@ public class OnlCgformAreaController extends JeroController改变状态,数据库不删 //中英切换提示语 - if(CutEnum.CN.getValue().equals(midTag.getCut())) { + if(LanguageEnum.CN.getValue().equals(midTag.getCut())) { result.success("批量删除成功!"); }else{ result.success("Batch deletion succeeded!"); diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 17583151..b3909d12 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; import com.jero.modules.tag.entity.OnlCgformArea; import com.jero.modules.tag.mapper.OnlCgformAreaMapper; @@ -190,7 +190,7 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryShowArea(String cut, OnlCgformArea onlCgformArea) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (CutEnum.CN.getValue().equals(cut)) { + if (LanguageEnum.CN.getValue().equals(cut)) { queryWrapper.select("id", "show_area").orderByAsc("sort"); return list(queryWrapper); } else { @@ -220,7 +220,7 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl records = result.getRecords(); String cut = (String) params.get("cut"); //中英切换-所属模块 - if(CutEnum.EN.getValue().equals(cut)){ + if(LanguageEnum.EN.getValue().equals(cut)){ for(OnlCgformArea data:records){ data.setIsModelName(data.getIsModelEnName()); } diff --git a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index d02e572c..077e9b10 100644 --- a/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; -import com.jero.common.constant.enums.CutEnum; +import com.jero.common.constant.enums.LanguageEnum; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.system.vo.LoginUser; import com.jero.generater.modules.online.cgform.service.impl.OnlCgformFieldServiceImpl; @@ -284,7 +284,7 @@ public class OnlCgformTagServiceImpl extends ServiceImpl records = result.getRecords(); String cut = (String) params.get("cut"); //中英切换-属性类型+展示区域列 - if(CutEnum.EN.getValue().equals(cut)){ + if(LanguageEnum.EN.getValue().equals(cut)){ for(OnlCgformTag data:records){ data.setFieldShowTypeName(data.getFieldShowTypeEnName()); data.setShowAreaName(data.getShowAreaEnName());