From d96de4b914c0fc377730db239100adee2f645a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Fri, 20 Jun 2025 16:16:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E9=A1=B5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E5=AF=BC=E5=85=A5=E6=8E=A5=E5=8F=A3=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=8A=A8=E5=88=9B=E5=BB=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MultilingualController.java | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java index 842f8b54..a8e31896 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/MultilingualController.java @@ -18,6 +18,7 @@ import com.nflg.mobilebroken.common.pojo.request.WebComponentUpdateRequest; import com.nflg.mobilebroken.common.pojo.vo.LanguageVO; import com.nflg.mobilebroken.common.pojo.vo.WebComponentInfoVO; import com.nflg.mobilebroken.common.pojo.vo.WebComponentVO; +import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.EecExcelUtil; import com.nflg.mobilebroken.common.util.ZipUtils; import com.nflg.mobilebroken.repository.entity.Language; @@ -48,6 +49,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -210,12 +212,25 @@ public class MultilingualController extends ControllerBase { String pageCode = (String) d.get("页面编号"); String componentCode = (String) d.get("组件编号"); log.info("模块编号:{},页面编号:{},组件编号:{}",moduleCode,pageCode,componentCode); - WebComponent webComponent = webComponentService.lambdaQuery() - .eq(WebComponent::getModuleCode, moduleCode) - .eq(WebComponent::getPageCode, pageCode) - .eq(WebComponent::getComponentCode, componentCode) - .one(); - if (Objects.nonNull(webComponent)) { + if (StrUtil.isNotBlank(moduleCode) && StrUtil.isNotBlank(pageCode) && StrUtil.isNotBlank(componentCode)){ + WebComponent webComponent = webComponentService.lambdaQuery() + .eq(WebComponent::getModuleCode, moduleCode) + .eq(WebComponent::getPageCode, pageCode) + .eq(WebComponent::getComponentCode, componentCode) + .one(); + if (Objects.isNull(webComponent)){ + webComponent = new WebComponent() + .setPageName((String) d.get("页面")) + .setPageCode(pageCode) + .setModuleName((String) d.get("模块")) + .setModuleCode(moduleCode) + .setComponentName((String) d.get("组件")) + .setComponentCode(componentCode) + .setCreateBy(AdminUserUtil.getUserId()) + .setCreateTime(LocalDateTime.now()); + webComponentService.save(webComponent); + } + int componentId = webComponent.getId(); d.remove("模块"); d.remove("模块编号"); d.remove("页面"); @@ -223,13 +238,13 @@ public class MultilingualController extends ControllerBase { d.remove("组件"); d.remove("组件编号"); webComponentTranslateService.remove(new LambdaQueryWrapper() - .eq(WebComponentTranslate::getComponentId, webComponent.getId())); + .eq(WebComponentTranslate::getComponentId, componentId)); List translates = new ArrayList<>(); d.forEach((k, v) -> { Language language = languages.stream().filter(l -> l.getName().equals(k)).findFirst().orElse(null); if (Objects.nonNull(language)) { WebComponentTranslate webComponentTranslate = new WebComponentTranslate() - .setComponentId(webComponent.getId()) + .setComponentId(componentId) .setLanguageId(language.getId()) .setValue(v.toString()); translates.add(webComponentTranslate); @@ -238,6 +253,8 @@ public class MultilingualController extends ControllerBase { if (CollectionUtil.isNotEmpty(translates)) { webComponentTranslateService.saveBatch(translates); } + }else { + log.error("模块编号,页面编号,组件编号都不能为空"); } }); return ApiResult.success();