From 83a0c003493f10490b4e98d56d9d00b892eae5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=B7=A1=E5=BF=98=E4=B8=80=E5=88=87?= <7990497@qq.com> Date: Fri, 17 Nov 2023 16:51:36 +0800 Subject: [PATCH] =?UTF-8?q?Finish=20Task=20#4531=20Cost:4h=C2=A0=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6=E5=90=88=E5=90=8C=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E5=8D=95=E4=BD=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InternationalController.java | 11 ++++++++-- .../core/service/InternationalService.java | 1 + .../impl/InternationalServiceImpl.java | 22 ++++++++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/blueland/common/core/controller/InternationalController.java b/src/main/java/com/blueland/common/core/controller/InternationalController.java index 2c7e4aa..c0425ff 100644 --- a/src/main/java/com/blueland/common/core/controller/InternationalController.java +++ b/src/main/java/com/blueland/common/core/controller/InternationalController.java @@ -128,7 +128,7 @@ public class InternationalController { } ) public AjaxResult translate(@RequestParam("targetLang") String targetLang, - @RequestParam("sourceLang") String sourceLang) { + @RequestParam("sourceLang") String sourceLang) { return AjaxResult.operates(internationalService.translate(targetLang, sourceLang, UserUtils.getTenantId())); } @@ -162,8 +162,15 @@ public class InternationalController { } ) public AjaxResult tenantIdTranslate(@RequestParam("sourceLang") String sourceLang, - String tenantId) { + String tenantId) { return AjaxResult.operates(internationalService.tenantIdTranslate(sourceLang, tenantId)); } + @GetMapping("/init") + @ApiOperation("初始化本租户的国际化数据") + public AjaxResult init() { + internationalService.init(); + return AjaxResult.success(); + } + } \ No newline at end of file diff --git a/src/main/java/com/blueland/common/core/service/InternationalService.java b/src/main/java/com/blueland/common/core/service/InternationalService.java index f480d20..01da2ba 100644 --- a/src/main/java/com/blueland/common/core/service/InternationalService.java +++ b/src/main/java/com/blueland/common/core/service/InternationalService.java @@ -111,4 +111,5 @@ public interface InternationalService extends IService { */ Boolean tenantIdTranslate(String sourceLang, String tenantId); + void init(); } \ No newline at end of file diff --git a/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java b/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java index cddb3c8..89f8407 100644 --- a/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java +++ b/src/main/java/com/blueland/common/core/service/impl/InternationalServiceImpl.java @@ -219,7 +219,7 @@ public class InternationalServiceImpl extends ServiceImpl el.size() > 1) .forEach(el -> { - Assert.isTrue(false,StrUtil.format("编码【{}】语言【{}】重复", el.get(0).getCode(), el.get(0).getLang())); + Assert.isTrue(false, StrUtil.format("编码【{}】语言【{}】重复", el.get(0).getCode(), el.get(0).getLang())); }); // 校验数据完整性 @@ -286,6 +286,26 @@ public class InternationalServiceImpl extends ServiceImpl list = list(wrapper); + if (CollUtil.isNotEmpty(list)) { + list.stream() + .collect(Collectors.groupingBy(International::getLang)) + .forEach((k, v) -> { + RedisUtil.hashMultiSet(k, v); + }); + } + + } + public Map list(List list) { QueryWrapper wrapper = QueryWrapper.create();