From 72bcbb36cc0116f7ba38baec000ae546c17c5bc0 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 13 Nov 2023 19:30:57 +0800 Subject: [PATCH] =?UTF-8?q?add:=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/common/aspect/LimitAspect.java | 3 +- .../security/config/bean/LoginProperties.java | 3 +- .../java/org/nl/common/utils/CodeUtil.java | 3 +- .../org/nl/common/utils/EncryptUtils.java | 4 ++- .../java/org/nl/common/utils/FileUtil.java | 3 +- .../org/nl/common/utils/ValidationUtil.java | 6 ++-- .../{LanguageUtil.java => LangProcess.java} | 2 +- .../org/nl/config/mybatis/CodeGenerator.java | 3 +- .../controller/dept/DeptController.java | 3 +- .../generator/CodeGeneratorController.java | 5 +-- .../MobileAuthorizationController.java | 5 +-- .../tools/ToolLocalStorageController.java | 3 +- .../controller/user/UserController.java | 9 ++--- .../coderule/impl/SysCodeRuleServiceImpl.java | 7 ++-- .../service/dept/impl/SysDeptServiceImpl.java | 3 +- .../service/dict/impl/SysDictServiceImpl.java | 13 +++---- .../impl/CodeGeneratorServiceImpl.java | 11 +++--- .../logicflow/impl/StageImageServiceImpl.java | 3 +- .../logicflow/impl/StageServiceImpl.java | 7 ++-- .../lucene/impl/LuceneServiceImpl.java | 3 +- .../service/menu/impl/SysMenuServiceImpl.java | 9 ++--- .../notice/impl/SysNoticeServiceImpl.java | 9 ++--- .../param/impl/SysParamServiceImpl.java | 7 ++-- .../impl/SysDataPermissionServiceImpl.java | 7 ++-- .../service/quartz/config/JobRunner.java | 4 +-- .../quartz/impl/SysQuartzJobServiceImpl.java | 7 ++-- .../service/quartz/utils/QuartzManage.java | 3 +- .../service/role/impl/SysRoleServiceImpl.java | 9 ++--- .../secutiry/impl/OnlineUserService.java | 9 ++--- .../impl/ToolLocalStorageServiceImpl.java | 5 +-- .../main/java/org/nl/wms/LanguageTest.java | 4 +-- .../impl/DasDeviceCheckRecordServiceImpl.java | 3 +- .../DasDeviceOperationRecordServiceImpl.java | 3 +- .../impl/DasQualityInspectionServiceImpl.java | 11 +++--- .../impl/MdBaseBrickInfoServiceImpl.java | 3 +- .../impl/MdBaseClassstandardServiceImpl.java | 9 ++--- .../impl/MdBaseMaterialServiceImpl.java | 3 +- .../impl/MdBaseVehicleServiceImpl.java | 3 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 36 ++++++++++--------- .../impl/SysInteractRecordServiceImpl.java | 3 +- .../wms/pda/service/impl/PdaServiceImpl.java | 7 ++-- .../impl/PdmBdMudConsumptionServiceImpl.java | 3 +- ...PdmBdRequestMaterialRecordServiceImpl.java | 3 +- .../impl/PdmBdMaterialResidueServiceImpl.java | 3 +- ...dProductionProcessTrackingServiceImpl.java | 3 +- .../impl/PdmBdVehicleBindingServiceImpl.java | 3 +- .../impl/PdmBdWorkorderServiceImpl.java | 13 +++---- ...aseAcsandlmsinteractivelogServiceImpl.java | 3 +- .../service/impl/SchBasePointServiceImpl.java | 3 +- .../service/impl/SchBaseTaskServiceImpl.java | 7 ++-- .../impl/SchBaseTaskconfigServiceImpl.java | 9 ++--- .../task_manage/task/tasks/dtk/CTQKTask.java | 3 +- .../task_manage/task/tasks/fj/FJSLTask.java | 5 +-- .../task_manage/task/tasks/yz/YZSLTask.java | 3 +- .../resources/language/buss/buss.properties | 17 +++++++++ .../language/buss/buss_en_US.properties | 17 +++++++++ .../language/buss/buss_id_ID.properties | 17 +++++++++ .../language/buss/buss_zh_CN.properties | 17 +++++++++ .../resources/language/error/error.properties | 18 ++++++++++ .../language/error/error_en_US.properties | 18 ++++++++++ .../language/error/error_id_ID.properties | 18 ++++++++++ .../language/error/error_zh_CN.properties | 18 ++++++++++ .../resources/language/login/login.properties | 8 ++++- .../language/login/login_en_US.properties | 8 ++++- .../language/login/login_id_ID.properties | 8 ++++- .../language/login/login_zh_CN.properties | 8 ++++- .../template/generator/admin/ServiceImpl.ftl | 2 +- .../src/test/java/org/nl/task/MapperTest.java | 9 ++--- 68 files changed, 357 insertions(+), 140 deletions(-) rename lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/{LanguageUtil.java => LangProcess.java} (95%) create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java index a669c5e..fed792f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java @@ -27,6 +27,7 @@ import org.nl.common.annotation.Limit; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RequestHolder; import org.nl.common.utils.StringUtils; +import org.nl.config.language.LangProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.data.redis.core.RedisTemplate; @@ -81,7 +82,7 @@ public class LimitAspect { log.info("第{}次访问key为 {}，描述为 [{}] 的接口", count, keys, limit.name()); return joinPoint.proceed(); } else { - throw new BadRequestException("访问次数受限制"); + throw new BadRequestException(LangProcess.msg("error_AccessLimit")); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java index 2babbf2..97d0124 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java @@ -20,6 +20,7 @@ import com.wf.captcha.*; import com.wf.captcha.base.Captcha; import lombok.Data; import org.nl.common.exception.BadConfigurationException; +import org.nl.config.language.LangProcess; import java.awt.*; import java.util.Objects; @@ -100,7 +101,7 @@ public class LoginProperties { captcha.setLen(loginCode.getLength()); break; default: - throw new BadConfigurationException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); + throw new BadConfigurationException(LangProcess.msg("login_codeError")); } } if(StrUtil.isNotEmpty(loginCode.getFontName())){ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index 8293df8..76cbada 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -3,6 +3,7 @@ package org.nl.common.utils; import lombok.SneakyThrows; import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; import org.nl.system.service.coderule.ISysCodeRuleService; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; @@ -25,7 +26,7 @@ public class CodeUtil { map.put("code",ruleCode); return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map); } else { - throw new BadRequestException("系统繁忙，稍后在试"); + throw new BadRequestException(LangProcess.msg("error_SystemError")); } } finally { if (tryLock) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java index 6603817..6aec11d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java @@ -15,6 +15,8 @@ */ package org.nl.common.utils; +import org.nl.config.language.LangProcess; + import javax.crypto.Cipher; import javax.crypto.SecretKey; import javax.crypto.SecretKeyFactory; @@ -88,7 +90,7 @@ public class EncryptUtils { private static byte[] hex2byte(byte[] b) { int size = 2; if ((b.length % size) != 0){ - throw new IllegalArgumentException("长度不是偶数"); + throw new IllegalArgumentException(LangProcess.msg("error_NumberError_1")); } byte[] b2 = new byte[b.length / 2]; for (int n = 0; n < b.length; n += size) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java index a3d9b0a..c4a6a70 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java @@ -22,6 +22,7 @@ import cn.hutool.poi.excel.ExcelUtil; import org.apache.poi.util.IOUtils; import org.apache.poi.xssf.streaming.SXSSFSheet; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.multipart.MultipartFile; @@ -249,7 +250,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { // 1M int len = 1024 * 1024; if (size > (maxSize * len)) { - throw new BadRequestException("文件超出规定大小"); + throw new BadRequestException(LangProcess.msg("error_File_1")); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java index 7b9d80a..7d3f97c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java @@ -18,6 +18,7 @@ package org.nl.common.utils; import cn.hutool.core.util.ObjectUtil; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; /** * 验证工具 @@ -29,10 +30,9 @@ public class ValidationUtil{ /** * 验证空 */ - public static void isNull(Object obj, String entity, String parameter , Object value){ + public static void isNull(Object obj, String entity, String parameter , String value){ if(ObjectUtil.isNull(obj)){ - String msg = entity + " 不存在: "+ parameter +" is "+ value; - throw new BadRequestException(msg); + throw new BadRequestException(LangProcess.msg("error_isNull",entity+"_"+parameter+"_"+value)); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LanguageUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java similarity index 95% rename from lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LanguageUtil.java rename to lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java index 435b2f2..aff166e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LanguageUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java @@ -9,7 +9,7 @@ import org.springframework.context.i18n.LocaleContextHolder; * @author ZZQ * @Date 2023/11/13 09:45 */ -public class LanguageUtil { +public class LangProcess { public static String msg(String code,String...args){ MessageSource bean = SpringContextHolder.getBean(MessageSource.class); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java index 2e59dc3..b1a7a1e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.generator.InjectionConfig; import com.baomidou.mybatisplus.generator.config.*; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; +import org.nl.config.language.LangProcess; import org.springframework.util.StringUtils; import java.util.ArrayList; @@ -30,7 +31,7 @@ public class CodeGenerator { return ipt; } } - throw new MybatisPlusException("请输入正确的" + tip + "！"); + throw new MybatisPlusException(LangProcess.msg("error_ParamError")); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index a576223..5126d87 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -25,6 +25,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.PageUtil; import org.nl.common.logging.annotation.Log; +import org.nl.config.language.LangProcess; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.dept.dto.DeptQuery; @@ -96,7 +97,7 @@ public class DeptController { // @SaCheckPermission("dept:edit") public ResponseEntity update(@Validated @RequestBody SysDept dept){ if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { - throw new BadRequestException("上级不能为自己"); + throw new BadRequestException(LangProcess.msg("login_childError")); } deptService.updateDept(dept); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index cc48b9d..ed99d9a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.ICodeGeneratorService; import org.nl.system.service.generator.dao.CodeColumnConfig; @@ -72,7 +73,7 @@ public class CodeGeneratorController { @PostMapping(value = "/{tableName}/{type}") public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ if(!generatorEnabled && type == 0){ - throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！"); + throw new BadRequestException(LangProcess.msg("error_CodeGenerator")); } switch (type){ // 生成代码 @@ -83,7 +84,7 @@ public class CodeGeneratorController { // 打包 case 2: generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response); break; - default: throw new BadRequestException("没有这个选项"); + default: throw new BadRequestException(LangProcess.msg("error_NullPoint")); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index 2cc9952..ba80c56 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -15,6 +15,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RsaUtils; import org.nl.common.utils.dto.CurrentUser; import org.nl.config.RsaProperties; +import org.nl.config.language.LangProcess; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; @@ -55,13 +56,13 @@ public class MobileAuthorizationController { SysUser userInfo = userService.getOne(new LambdaQueryWrapper() .eq(SysUser::getUsername, authUser.getUsername())); // 拿到多个已经抛出异常 if (ObjectUtil.isEmpty(userInfo) || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 - throw new BadRequestException("账号或密码错误！"); + throw new BadRequestException(LangProcess.msg("login_pwd")); } // 获取权限列表 - 登录查找权限 List permissionList = roleService.getPermissionList((JSONObject) JSON.toJSON(userInfo)); if (!userInfo.getIs_used()) { - throw new BadRequestException("账号未激活"); + throw new BadRequestException(LangProcess.msg("login_account")); } // 登录输入，登出删除 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java index e042e03..44862f6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java @@ -10,6 +10,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.logging.annotation.Log; +import org.nl.config.language.LangProcess; import org.nl.system.service.tools.IToolLocalStorageService; import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; @@ -58,7 +59,7 @@ public class ToolLocalStorageController { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); if (!FileUtil.IMAGE.equals(FileUtil.getFileType(suffix))) { - throw new BadRequestException("只能上传图片"); + throw new BadRequestException(LangProcess.msg("error_File_2")); } return new ResponseEntity<>(localStorageService.create(null, file), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index c9204a5..f5c4a6f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -31,6 +31,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RsaUtils; import org.nl.common.utils.SecurityUtils; import org.nl.common.logging.annotation.Log; +import org.nl.config.language.LangProcess; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.UserQuery; @@ -86,7 +87,7 @@ public class UserController { // @PutMapping(value = "center") public ResponseEntity center(@RequestBody SysUser resources){ if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ - throw new BadRequestException("不能修改他人资料"); + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); } userService.saveOrUpdate(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); @@ -109,10 +110,10 @@ public class UserController { String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass")); SysUser user = userService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername())); if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(oldPass, "salt"))) { - throw new BadRequestException("修改失败，旧密码错误"); + throw new BadRequestException(LangProcess.msg("login_pwd_1")); } if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) { - throw new BadRequestException("新密码不能与旧密码相同"); + throw new BadRequestException(LangProcess.msg("login_pwd_2")); } user.setPassword(SaSecureUtil.md5BySalt(newPass, "salt")); userService.updateById(user); @@ -132,7 +133,7 @@ public class UserController { String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); SysUser userInfo = userService.getOne(new QueryWrapper().eq("username",SecurityUtils.getCurrentUsername())); if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(password, "salt"))){ - throw new BadRequestException("密码错误"); + throw new BadRequestException(LangProcess.msg("login_pwd")); } userService.update(new UpdateWrapper().set(userInfo.getUsername(),user.getEmail())); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java index a42c268..938e712 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.MapOf; +import org.nl.config.language.LangProcess; import org.nl.system.service.coderule.ISysCodeRuleService; import org.nl.system.service.coderule.dao.SysCodeRule; import org.nl.system.service.coderule.dao.SysCodeRuleDetail; @@ -111,7 +112,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper().eq(SysCodeRule::getCode, codeRule.getCode())); - if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("编号[" + sysCodeRules.get(0).getCode() + "]已存在"); + if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException(LangProcess.msg("error_ParamExist",sysCodeRules.get(0).getCode())); codeRule.setId(IdUtil.getSnowflake(1,1).nextIdStr()); codeRule.setCreate_id(currentUserId); codeRule.setCreate_name(currentUsername); @@ -165,7 +166,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper() .eq(SysCodeRule::getCode, codeRule.getCode()) .ne(SysCodeRule::getId, codeRule.getId())); - if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException("该编码code已存在，请校验！"); + if (ObjectUtil.isNotEmpty(sysCodeRules)) throw new BadRequestException(LangProcess.msg("error_ParamExist",codeRule.getCode())); String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index dbe47eb..3687f32 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java @@ -10,6 +10,7 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.dto.CurrentUser; import org.nl.common.domain.vo.DeptVo; +import org.nl.config.language.LangProcess; import org.nl.system.service.dept.dto.DeptTree; import org.nl.common.utils.CopyUtil; import org.nl.config.IdUtil; @@ -157,7 +158,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl if (!CollectionUtils.isEmpty(depeIds)){ List deptRelation = sysDeptMapper.getDeptRelation(depeIds); if (!CollectionUtils.isEmpty(deptRelation)){ - throw new BadRequestException("部门存在绑定的人员，请先解绑人员对应部门"); + throw new BadRequestException(LangProcess.msg("dept_has")); } } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index ae50dfb..5bd1845 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.dict.ISysDictService; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; @@ -59,7 +60,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme String date = DateUtil.now(); List oldDict = sysDictMapper.selectList(new LambdaQueryWrapper() .eq(ObjectUtil.isNotEmpty(dict.getCode()), Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(oldDict)) throw new BadRequestException("字典[" + dict.getCode() + "]已存在"); + if (ObjectUtil.isNotEmpty(oldDict)) throw new BadRequestException(LangProcess.msg("error_ParamExist",dict.getCode())); dict.setDict_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dict.setCreate_id(currentUserId); dict.setCreate_name(nickName); @@ -75,11 +76,11 @@ public class SysDictServiceImpl extends ServiceImpl impleme public void updateDict(Dict dto) { Dict dict = sysDictMapper.selectById(dto.getDict_id()); if (ObjectUtil.isEmpty(dict)) { - throw new BadRequestException("字典不存在"); + throw new BadRequestException(LangProcess.msg("error_NullPoint")); } List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dto.getCode())); if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) - throw new BadRequestException("字典[" + dto.getCode() + "]已存在"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",dto.getCode())); String currentUserId = SecurityUtils.getCurrentUserId(); String currentNickName = SecurityUtils.getCurrentNickName(); // 根据code获取所有字典 @@ -130,7 +131,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme // 校验是否已经有标签 Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper().eq(Dict::getLabel, dict.getLabel()) .eq(Dict::getCode, dict.getCode())); - if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); + if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException(LangProcess.msg("error_ParamExist",dict.getCode())); // 判断是否有空的值 List selectOne = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); Dict dic = selectOne.get(0); @@ -165,13 +166,13 @@ public class SysDictServiceImpl extends ServiceImpl impleme public void updateDetail(Dict resources) { Dict dict = sysDictMapper.selectById(resources.getDict_id()); if (ObjectUtil.isEmpty(dict)) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); } // 校验是否已经有标签 List dictList = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getLabel, resources.getLabel()) .eq(Dict::getCode, resources.getCode())); if (ObjectUtil.isNotEmpty(dictList) && !resources.getLabel().equals(dict.getLabel())) { - throw new BadRequestException("标签[" + resources.getLabel() + "]已存在"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",resources.getLabel())); } resources.setUpdate_id(SecurityUtils.getCurrentUserId()); resources.setUpdate_name(SecurityUtils.getCurrentNickName()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java index bb7392c..0a828ab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java @@ -13,6 +13,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.utils.GenUtil; +import org.nl.config.language.LangProcess; import org.nl.system.service.generator.ICodeGeneratorService; import org.nl.system.service.generator.dao.CodeColumnConfig; import org.nl.system.service.generator.dao.CodeGenConfig; @@ -125,7 +126,7 @@ public class CodeGeneratorServiceImpl extends ServiceImpl preview(CodeGenConfig genConfig, IPage columns) { List columnsRecords = columns.getRecords(); if (genConfig.getConfig_id() == null) { - throw new BadRequestException("请先配置生成器"); + throw new BadRequestException(LangProcess.msg("genrator_cfg")); } List> genList = GenUtil.preview(columnsRecords, genConfig); return new ResponseEntity<>(genList, HttpStatus.OK); @@ -135,7 +136,7 @@ public class CodeGeneratorServiceImpl extends ServiceImpl columnsPage, HttpServletRequest request, HttpServletResponse response) { List columns = columnsPage.getRecords(); if (genConfig.getConfig_id() == null) { - throw new BadRequestException("请先配置生成器"); + throw new BadRequestException(LangProcess.msg("genrator_cfg")); } try { File file = new File(GenUtil.download(columns, genConfig)); @@ -143,7 +144,7 @@ public class CodeGeneratorServiceImpl extends ServiceImpl columnsPage) { List columns = columnsPage.getRecords(); if (genConfig.getConfig_id() == null) { - throw new BadRequestException("请先配置生成器"); + throw new BadRequestException(LangProcess.msg("genrator_cfg")); } try { GenUtil.generatorCode(columns, genConfig); } catch (IOException e) { log.error(e.getMessage(), e); - throw new BadRequestException("生成失败，请手动处理已生成的文件"); + throw new BadRequestException(LangProcess.msg("error_SystemError")); } } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java index 14b40a6..9bf921d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.logicflow.IStageImageService; import org.nl.system.service.logicflow.dao.StageImage; import org.nl.system.service.logicflow.dao.mapper.StageImageMapper; @@ -61,7 +62,7 @@ public class StageImageServiceImpl extends ServiceImpl() .eq(StageImage::getImage_uuid, entity.getImage_uuid())); - if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java index 0f3b62b..6f09dc6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java @@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.logicflow.IStageService; import org.nl.system.service.logicflow.dao.Stage; import org.nl.system.service.logicflow.dao.mapper.StageMapper; @@ -46,7 +47,7 @@ public class StageServiceImpl extends ServiceImpl implements public void create(Stage entity) { Stage stage = stageMapper.selectOne(new LambdaQueryWrapper().eq(Stage::getStage_code, entity.getStage_code())); if (ObjectUtil.isNotEmpty(stage)) { - throw new BadRequestException("舞台编码[" + entity.getStage_code() + "]已存在"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getStage_code())); } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -65,7 +66,7 @@ public class StageServiceImpl extends ServiceImpl implements @Override public void update(Stage dto) { Stage entity = stageMapper.selectOne(new LambdaQueryWrapper().eq(Stage::getStage_uuid, dto.getStage_uuid())); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); @@ -93,7 +94,7 @@ public class StageServiceImpl extends ServiceImpl implements public void addNewStage(Stage dto) { Stage stage = stageMapper.selectOne(new LambdaQueryWrapper().eq(Stage::getStage_code, dto.getStage_code())); if (ObjectUtil.isEmpty(stage)) { - throw new BadRequestException("舞台不存在"); + throw new BadRequestException(LangProcess.msg("error_NullPoint")); } // 设置内容 stage.setStage_data(dto.getStage_data()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java index 8bafbdf..1cbace2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.config.language.LangProcess; import org.nl.config.lucene.Searcher; import org.nl.system.service.lucene.LuceneService; import org.springframework.beans.factory.annotation.Value; @@ -35,7 +36,7 @@ public class LuceneServiceImpl implements LuceneService { jo.put("totalElements", totalElements); } catch (Exception e) { log.error("索引查询为空", e); - throw new NullPointerException("索引查询为空"); + throw new NullPointerException(LangProcess.msg("error_NullPoint")); } return jo; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index 7146a88..aa75aeb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -18,6 +18,7 @@ import org.nl.common.domain.vo.MenuMetaVo; import org.nl.common.domain.vo.MenuVo; import org.nl.common.utils.CopyUtil; import org.nl.config.IdUtil; +import org.nl.config.language.LangProcess; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.lucene.LuceneExecuteLogService; @@ -118,7 +119,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (resources.getIframe()) { String http = "http://", https = "https://"; if (!(resources.getPath().toLowerCase().startsWith(http) || resources.getPath().toLowerCase().startsWith(https))) { - throw new BadRequestException("外链必须以http://或者https://开头"); + throw new BadRequestException(LangProcess.msg("menu_url")); } } resources.setMenu_id(IdUtil.getStringId()); @@ -193,12 +194,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl String allChild = baseMapper.findAllChild(menuId); // 获取当前菜单的所有子菜单 List allChildIds = ObjectUtil.isNotEmpty(allChild)?Arrays.asList(allChild.split(",")):null; if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())){ - throw new BadRequestException("上级不能为自己或自己的下级"); + throw new BadRequestException(LangProcess.msg("login_childError")); } if (resources.getIframe()) { String http = "http://", https = "https://"; if (!(resources.getPath().toLowerCase().startsWith(http) || resources.getPath().toLowerCase().startsWith(https))) { - throw new BadRequestException("外链必须以http://或者https://开头"); + throw new BadRequestException(LangProcess.msg("menu_url")); } } @@ -387,7 +388,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public List buildMenus(String systemType) { Dict dict = sysDictMapper.selectOne(new QueryWrapper().eq("code", DictConstantPool.DICT_SYS_CODE).eq("value", systemType)); if (dict == null || StringUtils.isEmpty(dict.getPara1())){ - throw new BadRequestException("获取对应的系统菜单不存在"); + throw new BadRequestException(LangProcess.msg("error_isNull",DictConstantPool.DICT_SYS_CODE)); } String pid = dict.getPara1(); List menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(),systemType); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java index 2443148..a2050c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java @@ -19,6 +19,7 @@ import org.nl.common.mnt.websocket.MsgType; import org.nl.common.mnt.websocket.SocketMsg; import org.nl.common.mnt.websocket.WebSocketServer; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.notice.ISysNoticeService; @@ -87,7 +88,7 @@ public class SysNoticeServiceImpl extends ServiceImpl impl @Transactional(rollbackFor = Exception.class) public void create(Param param) { List code = paramMapper.selectByMap(MapOf.of("code", param.getCode())); - if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException("编码不能一致"); + if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException(LangProcess.msg("error_ParamExist",param.getCode())); param.setId(IdUtil.getSnowflake(1, 1).nextIdStr()); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -71,12 +72,12 @@ public class SysParamServiceImpl extends ServiceImpl impl public void update(Param param) { Param paramObj = paramMapper.selectById(param.getId()); if (ObjectUtil.isEmpty(paramObj)) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_SystemAuthError")); } Param param1 = paramMapper.selectOne(new LambdaQueryWrapper().eq(Param::getCode, param.getCode()) .and(lam -> lam.ne(Param::getId, param.getId()))); if (ObjectUtil.isNotEmpty(param1)) { - throw new BadRequestException("编码[" + param.getCode() + "]已存在"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",param.getCode())); } param.setUpdate_id(SecurityUtils.getCurrentUserId()); param.setUpdate_name(SecurityUtils.getCurrentNickName()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index cdee996..24b3da1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.permission.ISysDataPermissionService; @@ -74,7 +75,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl ids) { ids.forEach(id -> { List permissions = userService.getUserDataPermissionByPermissionId(id); - if (ObjectUtil.isNotEmpty(permissions)) throw new BadRequestException("存在相关联的数据权限，请解除关联后删除"); + if (ObjectUtil.isNotEmpty(permissions)) throw new BadRequestException(LangProcess.msg("per_auth")); dataPermissionMapper.deleteById(id); }); } @@ -126,7 +127,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl quartzJobs = quartzJobService.findByIsPauseIsFalse(); - quartzJobs.forEach(quartzManage::addJob); +// List quartzJobs = quartzJobService.findByIsPauseIsFalse(); +// quartzJobs.forEach(quartzManage::addJob); log.info("--------------------定时任务注入完成---------------------"); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java index 375463d..a3b4b20 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java @@ -12,6 +12,7 @@ import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.quartz.ISysQuartzJobService; import org.nl.system.service.quartz.dao.SysQuartzJob; import org.nl.system.service.quartz.dao.SysQuartzLog; @@ -71,7 +72,7 @@ public class SysQuartzJobServiceImpl extends ServiceImpl tasks = Arrays.asList(resources.getSub_task().split("[,，]")); if (tasks.contains(resources.getJob_id())) { - throw new BadRequestException("子任务中不能添加当前任务ID"); + throw new BadRequestException(LangProcess.msg("quartz_check")); } } resources.setUpdate_id(SecurityUtils.getCurrentUserId()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java index f51adc7..c03308c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java @@ -2,6 +2,7 @@ package org.nl.system.service.quartz.utils; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.system.service.quartz.dao.SysQuartzJob; import org.quartz.*; import org.quartz.impl.triggers.CronTriggerImpl; @@ -52,7 +53,7 @@ public class QuartzManage { } } catch (Exception e){ log.error("创建定时任务失败", e); - throw new BadRequestException("创建定时任务失败"); + throw new BadRequestException(LangProcess.msg("error_Create")); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 086c4d6..0a3c2e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -14,6 +14,7 @@ import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.menu.dao.mapper.SysMenuMapper; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.role.dao.SysRole; @@ -59,12 +60,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl public void create(JSONObject param) { //判断角色名字是否存在 String name = param.getString("name"); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) throw new BadRequestException(LangProcess.msg("role_Check_1")); SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException(LangProcess.msg("error_ParamExist",sysRole.getName())); String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); @@ -86,12 +87,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysRole sysRole = JSONObject.parseObject(JSONObject.toJSONString(param), SysRole.class); //判断角色名字是否存在 String name = sysRole.getName(); - if (StrUtil.isEmpty(name)) throw new BadRequestException("角色名字不能为空!"); + if (StrUtil.isEmpty(name)) throw new BadRequestException(LangProcess.msg("role_Check_1")); //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName()) .ne(SysRole::getRole_id, sysRole.getRole_id())); - if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); + if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException(LangProcess.msg("error_ParamExist",sysRole.getName())); String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index ec0188a..4ace7f6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -30,6 +30,7 @@ import org.nl.common.utils.*; import org.nl.config.RsaProperties; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.dto.CurrentUser; +import org.nl.config.language.LangProcess; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.secutiry.dto.UserDto; @@ -240,16 +241,16 @@ public class OnlineUserService { // 清除验证码 redisUtils.del(authUser.getUuid()); if (StrUtil.isEmpty(code)) { - throw new BadRequestException("验证码不存在或已过期"); + throw new BadRequestException(LangProcess.msg("login_CodeNull")); } if (StrUtil.isEmpty(authUser.getCode()) || !authUser.getCode().equalsIgnoreCase(code)) { - throw new BadRequestException("验证码错误"); + throw new BadRequestException(LangProcess.msg("login_CodeError")); } // 校验数据库 // 根据用户名查询，在比对密码 SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("username",authUser.getUsername())); if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, "salt"))) { // 这里需要密码加密 - throw new BadRequestException("账号或密码错误"); + throw new BadRequestException(LangProcess.msg("login_pwd")); } // 获取权限列表 - 登录查找权限 @@ -257,7 +258,7 @@ public class OnlineUserService { if (!userInfo.getIs_used()) { - throw new BadRequestException("账号未激活"); + throw new BadRequestException(LangProcess.msg("login_account")); } // 登录输入，登出删除 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java index 4a49142..0210b4a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java @@ -10,6 +10,7 @@ import org.nl.config.FileProperties; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.system.service.tools.dao.mapper.ToolLocalStorageMapper; import org.nl.system.service.tools.IToolLocalStorageService; @@ -52,7 +53,7 @@ public class ToolLocalStorageServiceImpl extends ServiceImpl pointLam = new QueryWrapper().lambda(); pointLam.eq(SchBasePoint::getPoint_code, deviceCode); @@ -95,11 +96,11 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl() .eq(MdBaseClassstandard::getClass_code, entity.getClass_code()) .eq(MdBaseClassstandard::getIs_delete, false)); if (ObjectUtil.isNotEmpty(mdBaseClassstandard) && !mdBaseClassstandard.getClass_id().equals(entity.getClass_id())) { - throw new BadRequestException("存在相同的基础类别编号"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getClass_id())); } // 查询原来的父id String oldPid = dto.getParent_class_id(); String newPid = entity.getParent_class_id(); if (entity.getParent_class_id() != null && entity.getClass_id().equals(entity.getParent_class_id())) { - throw new BadRequestException("上级不能为自己"); + throw new BadRequestException(LangProcess.msg("login_childError")); } String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java index 9624d55..71fb2e2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.wms.database.material.service.IMdBaseMaterialService; import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.database.material.service.dao.mapper.MdBaseMaterialMapper; @@ -85,7 +86,7 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl lam = new QueryWrapper().lambda(); @@ -200,13 +201,13 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl= Integer.parseInt(TaskStatus.FINISHED.getCode())) { - throw new BadRequestException("任务已完成或已取消!"); + throw new BadRequestException(LangProcess.msg("task_statusWrong")); } // 根据配置去工厂类获得类对象 String processing_class = config_code; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java index 782d301..bd7ef51 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java @@ -11,6 +11,7 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.wms.sch.task.service.ISchBaseTaskconfigService; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskconfigMapper; @@ -57,14 +58,14 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl().eq(SchBaseTaskconfig::getConfig_code, entity.getConfig_code())); if (ObjectUtil.isNotEmpty(schBaseTaskconfig)) - throw new BadRequestException("任务配置【" + entity.getConfig_code() + "】已存在!"); + throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getConfig_code())); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); if (ObjectUtil.isAllEmpty(entity.getStart_region_strs(), entity.getNext_region_strs())) - throw new BadRequestException("起点区域和终点区域不能同时为空!"); + throw new BadRequestException(LangProcess.msg("point_checkNull_1")); if (ObjectUtil.isNotEmpty(entity.getStart_region_strs())) { // 起点区域配置 @@ -91,9 +92,9 @@ public class SchBaseTaskconfigServiceImpl extends ServiceImpl