From 29a4a5cf1951165eb332ead78b4afd3eb0449f9e Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 28 Sep 2023 16:02:17 +0800 Subject: [PATCH] =?UTF-8?q?ci:=20=E9=83=A8=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E5=81=9A=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jero/modules/laws/common/constant/ResultCommon.java | 5 +++++ .../laws/common/service/impl/LawsCommonServiceImpl.java | 2 +- .../service/impl/EnterpriseStandardDeclareServiceImpl.java | 4 +++- .../laws/standard/controller/LawsDomesticController.java | 2 +- .../laws/standard/controller/LawsEnterpriseController.java | 2 +- .../laws/standard/controller/LawsOverseasController.java | 2 +- .../src/main/resources/i18n/messages.properties | 4 +++- .../src/main/resources/i18n/messages_en.properties | 3 +++ .../src/main/resources/i18n/messages_zh.properties | 5 ++++- 9 files changed, 22 insertions(+), 7 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java index e4e1ed55..b1dd7938 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/constant/ResultCommon.java @@ -53,4 +53,9 @@ public class ResultCommon { public static final String SELECT_LEVEL_TWO_TREE_NODE = "select.level.two.tree.node"; // 请先选择二级及以下体系 + public static final String EXPORT_ERROR = "export.error"; // 导出ZIP压缩包失败 + + public static final String IMPORT_ERROR = "import.error"; // 导入ZIP压缩包失败 + + public static final String PLEASE_UPLOAD_ZIP = "please.upload.zip.archive"; // 请上传Zip压缩包 } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 36a9c09b..7bdec755 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -1374,7 +1374,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService { // 判断上传的是不是压缩包 if (!Objects.requireNonNull(file.getOriginalFilename()).endsWith(".zip")) { - throw new JeroBootException("数据导入失败，请上传zip压缩包"); + throw new JeroBootException(MessageUtils.getMessage(ResultCommon.PLEASE_UPLOAD_ZIP)); } Path tempDirWithPrefix = Files.createTempDirectory("temp"); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java index 92886314..6444a592 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardDeclareServiceImpl.java @@ -5,6 +5,8 @@ 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.exception.JeroBootException; +import com.jero.common.util.MessageUtils; +import com.jero.modules.laws.common.constant.ResultCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardDeclare; import com.jero.modules.laws.enterprise.entity.dto.ESQueryCommonDTO; import com.jero.modules.laws.enterprise.entity.dto.EnterpriseStandardDeclareExPortDto; @@ -73,7 +75,7 @@ public class EnterpriseStandardDeclareServiceImpl extends ServiceImpl importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); if (errorMessages.size() > 0) { - return Result.error("导入失败", errorMessages); + return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); } return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java index 982bf77e..883a3bf6 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsEnterpriseController.java @@ -224,7 +224,7 @@ public class LawsEnterpriseController { public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); if (errorMessages.size() > 0) { - return Result.error("导入失败", errorMessages); + return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), errorMessages); } return Result.OK(); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 09d9beb3..3ccb5502 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -169,7 +169,7 @@ public class LawsOverseasController { public Result importExcelWithData(@RequestParam("file") MultipartFile file) { List errorMessages = lawsCommonService.importExcelWithData(file, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); if (errorMessages.size() > 0) { - return Result.error("导入失败", errorMessages); + return Result.error(ResultCommon.IMPORT_ERROR, errorMessages); } return Result.OK(); } diff --git a/laws-single-startup/src/main/resources/i18n/messages.properties b/laws-single-startup/src/main/resources/i18n/messages.properties index fdc5e68a..91b14f84 100644 --- a/laws-single-startup/src/main/resources/i18n/messages.properties +++ b/laws-single-startup/src/main/resources/i18n/messages.properties @@ -42,4 +42,6 @@ parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91 horizontal.transgression=\u6C34\u5E73\u8D8A\u6743 select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB - +export.error=\u5BFC\u51FA\u9519\u8BEF +import.error=\u5BFC\u5165\u9519\u8BEF +please.upload.zip.archive=\u6570\u636E\u5BFC\u5165\u5931\u8D25\uFF0C\u8BF7\u4E0A\u4F20zip\u538B\u7F29\u5305 \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_en.properties b/laws-single-startup/src/main/resources/i18n/messages_en.properties index 4bd2bbb1..3d6e49f1 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_en.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_en.properties @@ -45,3 +45,6 @@ parameters.cannot.be.null=Parameters cannot be null root.node.cannot.be.edited=Root node cannot be edited horizontal.transgression=Horizontal overstepping of authority select.level.two.tree.node=Please select a level 2 or lower system first +export.error=Export error +import.error=Import error +please.upload.zip.archive=Data import failed, please upload zip archive \ No newline at end of file diff --git a/laws-single-startup/src/main/resources/i18n/messages_zh.properties b/laws-single-startup/src/main/resources/i18n/messages_zh.properties index 9650f016..78249242 100644 --- a/laws-single-startup/src/main/resources/i18n/messages_zh.properties +++ b/laws-single-startup/src/main/resources/i18n/messages_zh.properties @@ -43,4 +43,7 @@ no.corresponding.record.found=\u672A\u627E\u5230\u5BF9\u5E94\u8BB0\u5F55 parameters.cannot.be.null=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A root.node.cannot.be.edited=\u6839\u8282\u70B9\u65E0\u6CD5\u7F16\u8F91 horizontal.transgression=\u6C34\u5E73\u8D8A\u6743 -select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB +select.level.two.tree.node=\u8BF7\u5148\u9009\u62E9\u4E8C\u7EA7\u53CA\u4EE5\u4E0B\u4F53\u7CFB` +export.zip.archive.error=\u5BFC\u51FA\u9519\u8BEF +import.zip.archive.error=\u5BFC\u5165\u9519\u8BEF +please.upload.zip.archive=\u6570\u636E\u5BFC\u5165\u5931\u8D25\uFF0C\u8BF7\u4E0A\u4F20zip\u538B\u7F29\u5305 \ No newline at end of file