From 4452029813f6ae61603548636b72defab1fdadd5 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Fri, 14 Nov 2025 14:26:36 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=8F=9C=E5=8D=95=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=94=AF=E6=8C=81=E7=9B=AE=E5=BD=95=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E7=9A=84name=E7=BF=BB=E8=AF=91=EF=BC=9B2=E3=80=81?= =?UTF-8?q?=E8=8F=9C=E5=8D=95/=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=AF=E6=8C=81=E8=8B=B1=E6=96=87=E5=85=A8?= =?UTF-8?q?=E5=8D=95=E8=AF=8D=E5=A4=A7=E5=B0=8F=E5=86=99=EF=BC=9B3?= =?UTF-8?q?=E3=80=81=E8=AF=AD=E7=A7=8D=E5=B7=A5=E5=85=B7zh=E8=AF=86?= =?UTF-8?q?=E5=88=AB=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/service/dict/DictDataServiceImpl.java | 10 +++++++++- .../system/service/permission/MenuServiceImpl.java | 12 +++++++++++- .../imes/module/system/util/locale/LocaleUtils.java | 2 +- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictDataServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictDataServiceImpl.java index 944319cb7..ab127bdcd 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictDataServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dict/DictDataServiceImpl.java @@ -38,6 +38,7 @@ import jakarta.annotation.Resource; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.LinkedHashMap; @@ -264,7 +265,14 @@ public class DictDataServiceImpl implements DictDataService { DictDatai18nDO i18n = new DictDatai18nDO(); i18n.setDictDataId(dictDataDO.getId()); i18n.setLocale(to); - i18n.setLabel(name); + if (LanguageEnum.EN.getLanguage().equals(to)) { + i18n.setLabel(Arrays.stream(name.split("\\s+")) + .filter(s -> !s.isEmpty()) + .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1)) + .collect(Collectors.joining(" "))); + } else { + i18n.setLabel(name); + } i18nList.add(i18n); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/MenuServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/MenuServiceImpl.java index 2553a3bc8..b243df12c 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/MenuServiceImpl.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/permission/MenuServiceImpl.java @@ -20,6 +20,7 @@ import com.cf.imes.module.system.dal.dataobject.permission.MenuI18nDO; import com.cf.imes.module.system.dal.mysql.permission.MenuMapper; import com.cf.imes.module.system.dal.mysql.permission.MenuI18nMapper; import com.cf.imes.module.system.dal.redis.RedisKeyConstants; +import com.cf.imes.module.system.enums.common.LanguageEnum; import com.cf.imes.module.system.enums.permission.MenuSourceTypeEnum; import com.cf.imes.module.system.enums.permission.MenuTypeEnum; import com.cf.imes.module.system.framework.trans.config.TransApi; @@ -41,6 +42,7 @@ import org.springframework.transaction.annotation.Transactional; import jakarta.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.LinkedHashMap; import java.util.List; @@ -371,7 +373,7 @@ public class MenuServiceImpl implements MenuService { // 查询所有有效的菜单类型 菜单 List menuDOS = menuMapper.selectList(new LambdaQueryWrapper() .eq(MenuDO::getDeleted, false) - .eq(MenuDO::getType, MenuTypeEnum.MENU.getType())); + .in(MenuDO::getType, MenuTypeEnum.MENU.getType(), MenuTypeEnum.DIR.getType())); // 转成有序 map（key = 序号, value = MenuDO） Map menuMap = IntStream.range(0, menuDOS.size()) @@ -416,6 +418,14 @@ public class MenuServiceImpl implements MenuService { i18n.setMenuId(menuDO.getId()); i18n.setLocale(to); i18n.setMenuName(name); + if (LanguageEnum.EN.getLanguage().equals(to)) { + i18n.setMenuName(Arrays.stream(name.split("\\s+")) + .filter(s -> !s.isEmpty()) + .map(s -> Character.toUpperCase(s.charAt(0)) + s.substring(1)) + .collect(Collectors.joining(" "))); + } else { + i18n.setMenuName(name); + } i18nList.add(i18n); } diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/util/locale/LocaleUtils.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/util/locale/LocaleUtils.java index 12385dd36..33a7453aa 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/util/locale/LocaleUtils.java +++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/util/locale/LocaleUtils.java @@ -24,7 +24,7 @@ public class LocaleUtils { return null; } - if (Locale.CHINA.equals(locale)) { + if (Locale.CHINESE.equals(locale)) { return null; }