root/lanzhouhailiang_two
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add:添加国际化配置

Browse Source
This commit is contained in:
zhangzq
2023-11-13 19:30:57 +08:00
parent 6208ffbcb4
commit 72bcbb36cc
68 changed files with 357 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java
View File

@@ -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"));
}
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java
View File

@@ -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())){

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java
View File

@@ -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) {

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java
View File

@@ -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) {

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java
View File

@@ -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"));
}
}

6
lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java
View File

@@ -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));
}
}

2
lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LanguageUtil.java → lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/language/LangProcess.java
View File

@@ -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);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java
View File

@@ -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"));
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java
View File

@@ -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<Object> 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);

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java
View File

@@ -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<Object> 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);
}

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java
View File

@@ -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<SysUser>()
.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<String> permissionList = roleService.getPermissionList((JSONObject) JSON.toJSON(userInfo));
if (!userInfo.getIs_used()) {
throw new BadRequestException("账号未激活");
throw new BadRequestException(LangProcess.msg("login_account"));
}
// 登录输入，登出删除

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java
View File

@@ -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);
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java
View File

@@ -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<Object> 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<SysUser>().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<SysUser>().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<SysUser>().set(userInfo.getUsername(),user.getEmail()));
return new ResponseEntity<>(HttpStatus.OK);

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleServiceImpl.java
View File

@@ -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<SysCodeRuleMapper, SysCo
if (!isSame) {
int initValue = Integer.parseInt(detail.getInit_value());
if (StrUtil.isEmpty((initValue + ""))) {
throw new BadRequestException("请完善编码数值的初始值！");
throw new BadRequestException(LangProcess.msg("error_NullPoint"));
}
detail.setCurrent_value(String.valueOf(initValue));
} else {
@@ -140,7 +141,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl<SysCodeRuleMapper, SysCo
String currentUsername = SecurityUtils.getCurrentUsername();
String now = DateUtil.now();
List<SysCodeRule> sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper<SysCodeRule>().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<SysCodeRuleMapper, SysCo
List<SysCodeRule> sysCodeRules = codeRuleMapper.selectList(new LambdaQueryWrapper<SysCodeRule>()
.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();

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java
View File

@@ -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<SysDeptMapper, SysDept> impl
if (!CollectionUtils.isEmpty(depeIds)){
List<Map> deptRelation = sysDeptMapper.getDeptRelation(depeIds);
if (!CollectionUtils.isEmpty(deptRelation)){
throw new BadRequestException("部门存在绑定的人员，请先解绑人员对应部门");
throw new BadRequestException(LangProcess.msg("dept_has"));
}
}
}

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java
View File

@@ -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<SysDictMapper, Dict> impleme
String date = DateUtil.now();
List<Dict> oldDict = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>()
.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<SysDictMapper, Dict> 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<Dict> dictList = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>().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<SysDictMapper, Dict> impleme
// 校验是否已经有标签
Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper<Dict>().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<Dict> selectOne = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>().eq(Dict::getCode, dict.getCode()));
Dict dic = selectOne.get(0);
@@ -165,13 +166,13 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, Dict> 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<Dict> dictList = sysDictMapper.selectList(new LambdaQueryWrapper<Dict>().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());

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java
View File

@@ -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<CodeColumnConfigMapper
public ResponseEntity<Object> preview(CodeGenConfig genConfig, IPage<CodeColumnConfig> columns) {
List<CodeColumnConfig> columnsRecords = columns.getRecords();
if (genConfig.getConfig_id() == null) {
throw new BadRequestException("请先配置生成器");
throw new BadRequestException(LangProcess.msg("genrator_cfg"));
}
List<Map<String, Object>> genList = GenUtil.preview(columnsRecords, genConfig);
return new ResponseEntity<>(genList, HttpStatus.OK);
@@ -135,7 +136,7 @@ public class CodeGeneratorServiceImpl extends ServiceImpl<CodeColumnConfigMapper
public void download(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage, HttpServletRequest request, HttpServletResponse response) {
List<CodeColumnConfig> 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<CodeColumnConfigMapper
ZipUtil.zip(file.getPath(), zipPath);
FileUtil.downloadFile(request, response, new File(zipPath), true);
} catch (IOException e) {
throw new BadRequestException("打包失败");
throw new BadRequestException(LangProcess.msg("error_SystemError"));
}
}
@@ -151,13 +152,13 @@ public class CodeGeneratorServiceImpl extends ServiceImpl<CodeColumnConfigMapper
public void generator(CodeGenConfig genConfig, IPage<CodeColumnConfig> columnsPage) {
List<CodeColumnConfig> 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"));
}
}
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java
View File

@@ -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<StageImageMapper, StageIm
public void update(StageImage entity) {
StageImage dto = stageImageMapper.selectOne(new LambdaQueryWrapper<StageImage>()
.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();

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java
View File

@@ -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<StageMapper, Stage> implements
public void create(Stage entity) {
Stage stage = stageMapper.selectOne(new LambdaQueryWrapper<Stage>().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<StageMapper, Stage> implements
@Override
public void update(Stage dto) {
Stage entity = stageMapper.selectOne(new LambdaQueryWrapper<Stage>().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<StageMapper, Stage> implements
public void addNewStage(Stage dto) {
Stage stage = stageMapper.selectOne(new LambdaQueryWrapper<Stage>().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());

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java
View File

@@ -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;

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java
View File

@@ -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<SysMenuMapper, SysMenu> 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<SysMenuMapper, SysMenu> impl
String allChild = baseMapper.findAllChild(menuId); // 获取当前菜单的所有子菜单
List<String> 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<SysMenuMapper, SysMenu> impl
public List<MenuVo> buildMenus(String systemType) {
Dict dict = sysDictMapper.selectOne(new QueryWrapper<Dict>().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<SysMenu> menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(),systemType);

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java
View File

@@ -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<SysNoticeMapper, SysNotice
@Override
public void update(SysNotice entity) {
SysNotice dto = sysNoticeMapper.selectById(entity.getNotice_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
sysNoticeMapper.updateById(entity);
}
@@ -125,7 +126,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
public void read(String id) {
SysNotice notice = this.getById(id);
if (ObjectUtil.isEmpty(notice)) {
throw new BadRequestException("该信息不存在!");
throw new BadRequestException(LangProcess.msg("error_isNull",id));
}
notice.setHave_read(NoticeEnum.HAVE_READ_ON.getValue());
notice.setRead_time(DateUtil.now());
@@ -136,7 +137,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
public void deal(String id) {
SysNotice notice = this.getById(id);
if (ObjectUtil.isEmpty(notice)) {
throw new BadRequestException("该信息不存在!");
throw new BadRequestException(LangProcess.msg("error_isNull",id));
}
// 设置处理
notice.setDeal_status(NoticeEnum.DEAL_STATUS_YES.getValue());
@@ -185,7 +186,7 @@ public class SysNoticeServiceImpl extends ServiceImpl<SysNoticeMapper, SysNotice
try {
webSocketServer.sendInfo(messageInfo, "messageInfo");
} catch (IOException e) {
throw new BadRequestException("消息发送失败");
throw new BadRequestException(LangProcess.msg("error_Send"));
}
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java
View File

@@ -13,6 +13,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.param.ISysParamService;
import org.nl.system.service.param.dao.Param;
import org.nl.system.service.param.dao.mapper.SysParamMapper;
@@ -52,7 +53,7 @@ public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, Param> 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<SysParamMapper, Param> 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<Param>().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());

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java
View File

@@ -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<SysDataPermissionM
@Transactional(rollbackFor = Exception.class)
public void update(SysDataPermission permission) {
SysDataPermission dataPermission = dataPermissionMapper.selectById(permission.getPermission_id());
if (ObjectUtil.isEmpty(dataPermission)) throw new BadRequestException("被删除或无权限，操作失败!");
if (ObjectUtil.isEmpty(dataPermission)) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
permission.setUpdate_time(DateUtil.now());
permission.setUpdate_id(SecurityUtils.getCurrentUserId());
permission.setUpdate_name(SecurityUtils.getCurrentNickName());
@@ -86,7 +87,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl<SysDataPermissionM
public void deleteAll(Set<String> ids) {
ids.forEach(id -> {
List<UserDataPermissionDto> 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<SysDataPermissionM
public void savePermission(JSONObject datas) {
String user_id = datas.getString("user_id");
JSONArray data = datas.getJSONArray("datas");
if (ObjectUtil.isEmpty(user_id)) throw new BadRequestException("用户不能为空");
if (ObjectUtil.isEmpty(user_id)) throw new BadRequestException(LangProcess.msg("error_isNull",user_id));
// 删除用户绑定的数据
userService.deleteDataPermissionById(user_id);
dataPermissionMapper.deleteScopeBySelfUserId(user_id);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/config/JobRunner.java
View File

@@ -29,8 +29,8 @@ public class JobRunner implements ApplicationRunner {
@Override
public void run(ApplicationArguments applicationArguments) {
log.info("--------------------注入定时任务---------------------");
List<SysQuartzJob> quartzJobs = quartzJobService.findByIsPauseIsFalse();
quartzJobs.forEach(quartzManage::addJob);
// List<SysQuartzJob> quartzJobs = quartzJobService.findByIsPauseIsFalse();
// quartzJobs.forEach(quartzManage::addJob);
log.info("--------------------定时任务注入完成---------------------");
}
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/impl/SysQuartzJobServiceImpl.java
View File

@@ -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<SysQuartzJobMapper, Sys
@Transactional(rollbackFor = Exception.class)
public void createJob(SysQuartzJob resources) {
if (!CronExpression.isValidExpression(resources.getCron_expression())) {
throw new BadRequestException("cron表达式格式错误");
throw new BadRequestException(LangProcess.msg("error_Config"));
}
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
@@ -92,12 +93,12 @@ public class SysQuartzJobServiceImpl extends ServiceImpl<SysQuartzJobMapper, Sys
@Transactional(rollbackFor = Exception.class)
public void updateJob(SysQuartzJob resources) {
if (!CronExpression.isValidExpression(resources.getCron_expression())) {
throw new BadRequestException("cron表达式格式错误");
throw new BadRequestException(LangProcess.msg("error_Config"));
}
if (StrUtil.isNotEmpty(resources.getSub_task())) {
List<String> 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());

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java
View File

@@ -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"));
}
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java
View File

@@ -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<SysRoleMapper, SysRole> 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<SysRole>().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<SysRoleMapper, SysRole> 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<SysRole>().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();

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java
View File

@@ -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<SysUser>().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"));
}
// 登录输入，登出删除

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java
View File

@@ -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<ToolLocalStorageMap
String type = FileUtil.getFileType(suffix);
File file = FileUtil.upload(multipartFile, properties.getPath().getPath() + type + File.separator);
if(ObjectUtil.isNull(file)){
throw new BadRequestException("上传失败");
throw new BadRequestException(LangProcess.msg("error_File_3"));
}
try {
String userId = SecurityUtils.getCurrentUserId();
@@ -85,7 +86,7 @@ public class ToolLocalStorageServiceImpl extends ServiceImpl<ToolLocalStorageMap
@Transactional(rollbackFor = Exception.class)
public void update(ToolLocalStorage resources) {
ToolLocalStorage storage = localStorageMapper.selectById(resources.getStorage_id());
if (ObjectUtil.isEmpty(storage)) throw new BadRequestException("文件信息不存在");
if (ObjectUtil.isEmpty(storage)) throw new BadRequestException(LangProcess.msg("error_NullPoint"));
resources.setUpdate_id(SecurityUtils.getCurrentUserId());
resources.setUpdate_name(SecurityUtils.getCurrentNickName());
resources.setUpdate_time(DateUtil.now());

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/LanguageTest.java
View File

@@ -6,7 +6,7 @@ package org.nl.wms;
*/
import cn.dev33.satoken.annotation.SaIgnore;
import org.nl.config.language.LanguageUtil;
import org.nl.config.language.LangProcess;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -18,6 +18,6 @@ public class LanguageTest {
@GetMapping("/code")
@SaIgnore
public String language(String code){
return LanguageUtil.msg(code,"");
return LangProcess.msg(code,"");
}
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService;
@@ -58,7 +59,7 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl<DasDeviceCheckR
@Override
public void update(DasDeviceCheckRecord entity) {
DasDeviceCheckRecord dto = dasDeviceCheckRecordMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setRecord_time(now);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java
View File

@@ -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.system.service.user.ISysUserService;
import org.nl.system.service.user.dao.SysUser;
import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService;
@@ -59,7 +60,7 @@ public class DasDeviceOperationRecordServiceImpl extends ServiceImpl<DasDeviceOp
@Override
public void update(DasDeviceOperationRecord entity) {
DasDeviceOperationRecord dto = dasDeviceOperationRecordMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
entity.setRecord_time(DateUtil.now());
dasDeviceOperationRecordMapper.updateById(entity);

11
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java
View File

@@ -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.das.inspection.service.IDasQualityInspectionService;
import org.nl.wms.das.inspection.service.dao.mapper.DasQualityInspectionMapper;
import org.nl.wms.das.inspection.service.dao.DasQualityInspection;
@@ -66,7 +67,7 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl<DasQualityInspe
@Override
public void update(DasQualityInspection entity) {
DasQualityInspection dto = dasQualityInspectionMapper.selectById(entity.getInspection_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setInspection_time(now);
@@ -83,11 +84,11 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl<DasQualityInspe
public void createByAcs(ApplyTaskRequest applyTaskRequest) {
String deviceCode = applyTaskRequest.getDevice_code();
if (ObjectUtil.isEmpty(deviceCode)) {
throw new BadRequestException("质检记录-拆垛工位不能为空");
throw new BadRequestException(LangProcess.msg("device_check"));
}
String vehicleCode = applyTaskRequest.getVehicle_code();
if (ObjectUtil.isEmpty(vehicleCode)) {
throw new BadRequestException("质检记录-载具编码不能为空");
throw new BadRequestException(LangProcess.msg("vehicle_check"));
}
LambdaQueryWrapper<SchBasePoint> pointLam = new QueryWrapper<SchBasePoint>().lambda();
pointLam.eq(SchBasePoint::getPoint_code, deviceCode);
@@ -95,11 +96,11 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl<DasQualityInspe
// 生产中的工单， 如果ACS能给就直接查
PdmBdWorkorder deviceProductionTask = workorderService.getDeviceProductionTask(one.getParent_point_code());
if (ObjectUtil.isEmpty(deviceProductionTask)) {
throw new BadRequestException("质检记录-设备[" + one.getParent_point_code() + "]未存在生产中的工单");
throw new BadRequestException(LangProcess.msg("workorder_checkRun",one.getParent_point_code()));
}
MdBaseMaterial baseMaterial = materialService.getById(deviceProductionTask.getMaterial_id());
if (ObjectUtil.isEmpty(baseMaterial)) {
throw new BadRequestException("质检记录-物料ID[" + deviceProductionTask.getMaterial_id() + "]不存在");
throw new BadRequestException(LangProcess.msg("material_check",deviceProductionTask.getMaterial_id()));
}
DasQualityInspection dasQualityInspection = new DasQualityInspection();
dasQualityInspection.setInspection_id(IdUtil.getSnowflake(1,1).nextIdStr());

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/impl/MdBaseBrickInfoServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.wms.database.brick.service.IMdBaseBrickInfoService;
import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo;
import org.nl.wms.database.brick.service.dao.mapper.MdBaseBrickInfoMapper;
@@ -55,7 +56,7 @@ public class MdBaseBrickInfoServiceImpl extends ServiceImpl<MdBaseBrickInfoMappe
@Override
public void update(MdBaseBrickInfo entity) {
MdBaseBrickInfo dto = mdBaseBrickInfoMapper.selectById(entity.getBrick_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
mdBaseBrickInfoMapper.updateById(entity);
}

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java
View File

@@ -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.database.classification.service.IMdBaseClassstandardService;
import org.nl.wms.database.classification.service.dao.MdBaseClassstandard;
import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandardMapper;
@@ -65,7 +66,7 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
.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()));
}
String currentUserId = SecurityUtils.getCurrentUserId();
@@ -103,20 +104,20 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl<MdBaseClassstand
@Override
public void update(MdBaseClassstandard entity) {
MdBaseClassstandard dto = mdBaseClassstandardMapper.selectById(entity.getClass_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
// 判断是否存在
MdBaseClassstandard mdBaseClassstandard = mdBaseClassstandardMapper
.selectOne(new LambdaQueryWrapper<MdBaseClassstandard>()
.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();

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java
View File

@@ -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<MdBaseMaterialMapper,
@Override
public void update(MdBaseMaterial entity) {
MdBaseMaterial dto = mdBaseMaterialMapper.selectById(entity.getMaterial_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java
View File

@@ -12,6 +12,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.vehicle.service.IMdBaseVehicleService;
import org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper;
import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle;
@@ -64,7 +65,7 @@ public class MdBaseVehicleServiceImpl extends ServiceImpl<MdBaseVehicleMapper, M
@Override
public void update(MdBaseVehicle entity) {
MdBaseVehicle dto = mdBaseVehicleMapper.selectById(entity.getVehicle_code());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

36
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.das.inspection.service.IDasQualityInspectionService;
import org.nl.wms.database.brick.service.IMdBaseBrickInfoService;
@@ -139,7 +140,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
String requestMethodCode = param.getString("request_medthod_code"); // 获取请求方法名
Method method = methodCache.get(StrUtil.toCamelCase(requestMethodCode));
if (method == null) {
throw new BadRequestException("请求方法不存在");
throw new BadRequestException(LangProcess.msg("error_isNull",requestMethodCode));
}
result = (BaseResponse) method.invoke(this, param);
} catch (Exception e) {
@@ -179,14 +180,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误!");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
param.put("config_code", configCode);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -217,14 +218,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
param.put("config_code", configCode);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -255,14 +256,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
param.put("config_code", configCode);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -294,7 +295,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
@@ -303,7 +304,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
param.put("special_param", handling);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -344,13 +345,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
param.put("config_code", configCode);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -367,6 +368,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
* @return
* @see org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest
*/
@Override
@SneakyThrows
public ApplyTaskResponse applyForceTakeFullVehicleInStorage(JSONObject param) {
// 找到当前的设备
@@ -379,13 +381,13 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
try {
if (tryLock) {
if (ObjectUtil.isEmpty(basePoint)) {
throw new BadRequestException("点位错误！");
throw new BadRequestException(LangProcess.msg("error_Point"));
}
// 组织参数
param.put("config_code", configCode);
taskService.apply(param);
} else {
throw new BadRequestException("其他设备占用锁，等待结束！");
throw new BadRequestException(LangProcess.msg("error_LockOut",configCode));
}
} finally {
if (tryLock) {
@@ -607,7 +609,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
ApplyTaskResponse taskResponse = ApplyTaskResponse.responseOk(requestNo);
SchBasePoint basePoint = pointService.getById(baseRequest.getDevice_code());
if (ObjectUtil.isEmpty(baseRequest.getVehicle_code())) {
throw new BadRequestException("载具编码不能为空!");
throw new BadRequestException(LangProcess.msg("vehicle_check"));
}
baseRequest.setVehicle_code(TaskUtils.defaultVehicleCode(baseRequest.getVehicle_code()));
if (ObjectUtil.isEmpty(baseRequest.getVehicle_type())) {
@@ -617,7 +619,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
SchBaseVehiclematerialgroup one = vehiclematerialgroupService.getGroupInfo(baseRequest.getVehicle_code(),
baseRequest.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
if (ObjectUtil.isEmpty(one)) {
throw new BadRequestException("载具编码为" + baseRequest.getVehicle_code() + "组盘不存在!");
throw new BadRequestException(LangProcess.msg("vehicle_check_1",baseRequest.getVehicle_code()));
}
String yjDeviceCode = basePoint.getParent_point_code(); // 压机设备编码
SchBasePoint devicePoint = pointService.getById(yjDeviceCode);
@@ -625,14 +627,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
PdmBdWorkorder productionTask = workorderService.getDeviceProductionTask(yjDeviceCode);
// 校验物料是否正确
if (ObjectUtil.isEmpty(productionTask)) {
throw new BadRequestException("压机" + yjDeviceCode + "工单不存在!");
throw new BadRequestException(LangProcess.msg("workorder_checkRun",yjDeviceCode));
}
// 泥料
// todo: 暂时写死
String rawMaterialCode = productionTask.getRaw_material_code();
// String rawMaterialCode = one.getRedundance_material_code();
if (!rawMaterialCode.equals(one.getRedundance_material_code())) {
throw new BadRequestException("物料不一样!");
throw new BadRequestException(LangProcess.msg("material_notEq"));
}
if (ObjectUtil.isNotEmpty(basePoint)) {
// 记录当前位置

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java
View File

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.param.dao.Param;
import org.nl.wms.ext.acs.service.dto.ResultForAcs;
import org.nl.wms.ext.acs.service.dto.to.BaseResponse;
@@ -69,7 +70,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl<SysInteractRecordM
@Override
public void update(SysInteractRecord entity) {
SysInteractRecord dto = sysInteractRecordMapper.selectById(entity.getInteract_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
sysInteractRecordMapper.updateById(entity);
}

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
View File

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
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.ext.acs.service.WmsToAcsService;
@@ -83,12 +84,12 @@ public class PdaServiceImpl implements PdaService {
@Override
public PdaResponseVo manualCreateByPda(ManualGroupDto entity) {
if (ObjectUtil.isEmpty(entity)) {
throw new BadRequestException("组盘不能为空");
throw new BadRequestException(LangProcess.msg("error_NullPoint"));
}
SchBaseVehiclematerialgroup groupInfo = vehiclematerialgroupService.getGroupInfo(entity.getVehicle_code(),
entity.getVehicle_type(), GroupBindMaterialStatusEnum.BOUND.getValue());
if (ObjectUtil.isNotEmpty(groupInfo)) {
throw new BadRequestException("组盘信息已存在");
throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getVehicle_code()));
}
// 获取压机工单
PdmBdWorkorder bdWorkorder = workorderService.getDeviceProductionTask(entity.getPoint_code());
@@ -128,7 +129,7 @@ public class PdaServiceImpl implements PdaService {
@Override
public PdaResponseVo sendTask(BlendingMoveDto blendingMoveDto) {
if (ObjectUtil.isEmpty(blendingMoveDto.getStart_point_code())) {
throw new BadRequestException("混碾位不能为空");
throw new BadRequestException(LangProcess.msg("point_checkNull"));
}
// 向acs获取吨袋号、重量
SchBasePoint basePoint = pointService.getById(blendingMoveDto.getStart_point_code());

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java
View File

@@ -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.pdm.consumption.service.IPdmBdMudConsumptionService;
import org.nl.wms.pdm.consumption.service.dao.mapper.PdmBdMudConsumptionMapper;
import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption;
@@ -53,7 +54,7 @@ public class PdmBdMudConsumptionServiceImpl extends ServiceImpl<PdmBdMudConsumpt
@Override
public void update(PdmBdMudConsumption entity) {
PdmBdMudConsumption dto = pdmBdMudConsumptionMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setRecord_time(now);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java
View File

@@ -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.pdm.record.service.IPdmBdRequestMaterialRecordService;
import org.nl.wms.pdm.record.service.dao.mapper.PdmBdRequestMaterialRecordMapper;
import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord;
@@ -52,7 +53,7 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl<PdmBdRequ
@Override
public void update(PdmBdRequestMaterialRecord entity) {
PdmBdRequestMaterialRecord dto = pdmBdRequestMaterialRecordMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
pdmBdRequestMaterialRecordMapper.updateById(entity);
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java
View File

@@ -12,6 +12,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.ext.acs.service.dto.to.wms.ApplyTaskRequest;
import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService;
import org.nl.wms.pdm.residue.service.dao.mapper.PdmBdMaterialResidueMapper;
@@ -56,7 +57,7 @@ public class PdmBdMaterialResidueServiceImpl extends ServiceImpl<PdmBdMaterialRe
@Override
public void update(PdmBdMaterialResidue entity) {
PdmBdMaterialResidue dto = pdmBdMaterialResidueMapper.selectById(entity.getRecord_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setRecord_time(now);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/impl/PdmBdProductionProcessTrackingServiceImpl.java
View File

@@ -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.pdm.track.service.IPdmBdProductionProcessTrackingService;
import org.nl.wms.pdm.track.service.dao.mapper.PdmBdProductionProcessTrackingMapper;
import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking;
@@ -49,7 +50,7 @@ public class PdmBdProductionProcessTrackingServiceImpl extends ServiceImpl<PdmBd
@Override
public void update(PdmBdProductionProcessTracking entity) {
PdmBdProductionProcessTracking dto = pdmBdProductionProcessTrackingMapper.selectById(entity.getProcess_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/vehiclebiding/service/impl/PdmBdVehicleBindingServiceImpl.java
View File

@@ -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.pdm.vehiclebiding.service.IPdmBdVehicleBindingService;
import org.nl.wms.pdm.vehiclebiding.service.dao.mapper.PdmBdVehicleBindingMapper;
import org.nl.wms.pdm.vehiclebiding.service.dao.PdmBdVehicleBinding;
@@ -51,7 +52,7 @@ public class PdmBdVehicleBindingServiceImpl extends ServiceImpl<PdmBdVehicleBind
@Override
public void update(PdmBdVehicleBinding entity) {
PdmBdVehicleBinding dto = pdmBdVehicleBindingMapper.selectById(entity.getAssociate_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setRecord_time(now);

13
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java
View File

@@ -15,6 +15,7 @@ import org.nl.common.domain.query.PageQuery;
import org.nl.common.exception.BadRequestException;
import org.nl.common.utils.CodeUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.config.language.LangProcess;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.database.material.service.IMdBaseMaterialService;
import org.nl.wms.database.material.service.dao.MdBaseMaterial;
@@ -104,7 +105,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
// 获取物料
MdBaseMaterial material = materialService.getById(entity.getMaterial_id());
if (ObjectUtil.isEmpty(material.getPack_method()) || ObjectUtil.isEmpty(material.getPack_palletspec())) {
throw new BadRequestException("创建工单失败，物料[" + entity.getMaterial_id() + "]包装规格为空，请维护！");
throw new BadRequestException(LangProcess.msg("material_cfg",entity.getMaterial_id()));
}
int orderSubnum = entity.getOrder_subnum(); // 计划量
int guadansum = entity.getGuadansum(); // 已经包装数
@@ -128,7 +129,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Override
public void update(PdmBdWorkorder entity) {
PdmBdWorkorder dto = pdmBdWorkorderMapper.selectById(entity.getWorkorder_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String now = DateUtil.now();
entity.setUpdate_id(GeneralDefinition.ACS_ID);
@@ -147,7 +148,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Override
public PdmBdWorkorder getDeviceProductionTask(String deviceCode) {
if (ObjectUtil.isEmpty(deviceCode)) {
throw new BadRequestException("根据设备查询工单，设备编码不能为空");
throw new BadRequestException(LangProcess.msg("device_check"));
}
// 只能有一个生产中
LambdaQueryWrapper<PdmBdWorkorder> lam = new QueryWrapper<PdmBdWorkorder>().lambda();
@@ -200,13 +201,13 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
// 通知
noticeService.createNotice("工单下发失败: " + e.getMessage(), "工单下发失败: "
+ pdmBdWorkorder.getWorkorder_code(), NoticeTypeEnum.EXCEPTION.getCode());
throw new BadRequestException("工单下发失败");
throw new BadRequestException(LangProcess.msg("error_Send"));
}
if (resultForAcs.getCode() != HttpStatus.HTTP_OK) {
// 不成功
noticeService.createNotice(resultForAcs.getMessage(), "工单下发失败: " + pdmBdWorkorder.getWorkorder_code(),
NoticeTypeEnum.EXCEPTION.getCode());
throw new BadRequestException("工单下发失败");
throw new BadRequestException(LangProcess.msg("error_Send"));
}
// 修改工单数据
pdmBdWorkorder.setWorkorder_status(WorkOrderStatusEnum.ISSUED.getCode());
@@ -217,7 +218,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl<PdmBdWorkorderMapper,
@Override
public PdmBdWorkorder getDeviceDockingProductionTask(String deviceCode) {
if (ObjectUtil.isEmpty(deviceCode)) {
throw new BadRequestException("根据设备查询工单，设备编码不能为空");
throw new BadRequestException(LangProcess.msg("device_check"));
}
// 查找父类设备
SchBasePoint basePoint = pointService.getById(deviceCode);

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/interactivelog/service/impl/SchBaseAcsandlmsinteractivelogServiceImpl.java
View File

@@ -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.interactivelog.service.ISchBaseAcsandlmsinteractivelogService;
import org.nl.wms.sch.interactivelog.service.dao.mapper.SchBaseAcsandlmsinteractivelogMapper;
import org.nl.wms.sch.interactivelog.service.dao.SchBaseAcsandlmsinteractivelog;
@@ -59,7 +60,7 @@ public class SchBaseAcsandlmsinteractivelogServiceImpl extends ServiceImpl<SchBa
@Override
public void update(SchBaseAcsandlmsinteractivelog entity) {
SchBaseAcsandlmsinteractivelog dto = schBaseAcsandlmsinteractivelogMapper.selectById(entity.getLog_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java
View File

@@ -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.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.sch.point.service.dao.mapper.SchBasePointMapper;
@@ -110,7 +111,7 @@ public class SchBasePointServiceImpl extends ServiceImpl<SchBasePointMapper, Sch
String point_code = entity.getPoint_code();
SchBasePoint pointObj = pointMapper.selectById(point_code);
if (ObjectUtil.isNotEmpty(pointObj) && !pointObj.getPoint_code().equals(entity.getPoint_code())) {
throw new BadRequestException("存在相同的点位编码");
throw new BadRequestException(LangProcess.msg("error_ParamExist",entity.getPoint_code()));
}
// 默认父类点位为自身

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -15,6 +15,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.ISchBaseTaskService;
import org.nl.wms.sch.task.service.dao.SchBaseTask;
import org.nl.wms.sch.task.service.dao.mapper.SchBaseTaskMapper;
@@ -89,7 +90,7 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
@Override
public void update(SchBaseTask entity) {
SchBaseTask dto = schBaseTaskMapper.selectById(entity.getTask_code());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();
@@ -207,12 +208,12 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
String method_name = ObjectUtil.isNotEmpty(param.get("method_name")) ? param.get("method_name").toString() : null;
String config_code = ObjectUtil.isNotEmpty(param.get("config_code")) ? param.get("config_code").toString() : null;
if (ObjectUtil.isEmpty(task_code) || ObjectUtil.isEmpty(method_name) || ObjectUtil.isEmpty(config_code)) {
throw new BadRequestException("操作失败");
throw new BadRequestException(LangProcess.msg("error_NullPoint"));
}
// 根据标识找到任务
SchBaseTask taskOne = this.getByCode(task_code);
if (Integer.parseInt(taskOne.getTask_status()) >= Integer.parseInt(TaskStatus.FINISHED.getCode())) {
throw new BadRequestException("任务已完成或已取消!");
throw new BadRequestException(LangProcess.msg("task_statusWrong"));
}
// 根据配置去工厂类获得类对象
String processing_class = config_code;

9
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/impl/SchBaseTaskconfigServiceImpl.java
View File

@@ -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<SchBaseTaskconfigM
public void create(SchBaseTaskconfig entity) {
SchBaseTaskconfig schBaseTaskconfig = schBaseTaskconfigMapper.selectOne(new LambdaQueryWrapper<SchBaseTaskconfig>().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<SchBaseTaskconfigM
@Override
public void update(SchBaseTaskconfig entity) {
SchBaseTaskconfig dto = schBaseTaskconfigMapper.selectById(entity.getConfig_id());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
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())) {
// 起点区域配置

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/dtk/CTQKTask.java
View File

@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
@@ -99,7 +100,7 @@ public class CTQKTask extends AbstractTask {
// 消息通知
noticeService.createNotice("拆盘机暂无托盘！", TASK_CONFIG_CODE + task.getPoint_code2(),
NoticeTypeEnum.WARN.getCode());
throw new BadRequestException("拆盘机暂无托盘！");
throw new BadRequestException(LangProcess.msg("point_checkNull"));
}
// 设置终点并修改创建成功状态
task.setPoint_code1(point.getPoint_code());

5
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService;
import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService;
@@ -197,7 +198,7 @@ public class FJSLTask extends AbstractTask {
public void forceFinish(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
}
this.finishTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}
@@ -206,7 +207,7 @@ public class FJSLTask extends AbstractTask {
public void cancel(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
}
this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}

3
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java
View File

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.nl.common.exception.BadRequestException;
import org.nl.config.language.LangProcess;
import org.nl.system.service.notice.ISysNoticeService;
import org.nl.wms.database.brick.service.IMdBaseBrickInfoService;
import org.nl.wms.ext.mes.service.WmsToMesService;
@@ -307,7 +308,7 @@ public class YZSLTask extends AbstractTask {
public void cancel(String task_code) {
SchBaseTask taskObj = taskService.getByCode(task_code);
if (ObjectUtil.isEmpty(taskObj)) {
throw new BadRequestException("该任务不存在");
throw new BadRequestException(LangProcess.msg("task_isNull",task_code));
}
this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC);
}

17
lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss.properties Normal file
View File

@@ -0,0 +1,17 @@
dept_has=部门存在绑定的人员，请先解绑人员对应部门
device_check=设备编号不能为空
genrator_cfg=请先配置生成器
material_cfg=物料{0}配置信息异常,请维护
material_check=物料ID{0}不存在
material_notEq=物料不一致
menu_url=外链必须以http\://或者https\://开头
per_auth=存在关联的数据权限，请解除关联后删除
point_checkNull=点位不能为空
point_checkNull_1=起点或终点不能同时为空
quartz_check=子任务中不能添加当前任务ID
role_Check_1=角色名字不能为空
task_isNull=任务信息不存在{0}
task_statusWrong=任务已完成或已取消
vehicle_check=载具编码不能为空
vehicle_check_1=载具{0}组盘信息不存在
workorder_checkRun=该设备{0}不在生产中的工单

17
lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_en_US.properties Normal file
View File

@@ -0,0 +1,17 @@
dept_has=Ada personal terikat di departments Tolong lepaskan departments yang sama dari personal persona
device_check=Equipment number cannot be empty
genrator_cfg=Please configure the generator first
material_cfg=Abnormal configuration information for material {0}, please maintain
material_check=Item ID {0} does not exist
material_notEq=Material inconsistency
menu_url=External links must start with http\://or https\://
per_auth=There is an associated data permission, please remove it after disassociation
point_checkNull=The point cannot be empty
point_checkNull_1=The starting or ending points cannot both be empty
quartz_check=The current task ID cannot be added to a subtask
role_Check_1=The character name cannot be empty
task_isNull=Task information does not exist {0}
task_statusWrong=Task completed or canceled
vehicle_check=Vehicle code cannot be empty
vehicle_check_1=The disk information of vehicle {0} does not exist
workorder_checkRun=The equipment {0} is not in production for a work order

17
lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties Normal file
View File

@@ -0,0 +1,17 @@
dept_has=Ada personil terikat di departemen. Tolong lepaskan departemen yang sama dari personil pertama
device_check=Nomor peralatan tidak dapat kosong
genrator_cfg=Silakan konfigur generator pertama
material_cfg=Informasi konfigurasi abnormal untuk material {0}, silakan tetap
material_check=ID Item {0} tidak ada
material_notEq=Tidak konsistens materi
menu_url=Hubungan luar harus dimulai dengan http\://atau https\://
per_auth=Ada izin data terkait, silakan hapuskan setelah pemisahan
point_checkNull=Titik tidak dapat kosong
point_checkNull_1=Titik awal atau akhir tidak dapat berdua kosong
quartz_check=ID tugas saat ini tidak dapat ditambah ke subtask
role_Check_1=Nama karakter tidak dapat kosong
task_isNull=Informasi tugas tidak ada {0}
task_statusWrong=Tugas selesai atau dibatalkan
vehicle_check=Kode kendaraan tidak dapat kosong
vehicle_check_1=Informasi disk dari kendaraan {0} tidak ada
workorder_checkRun=Perangkat {0} tidak dalam produksi untuk perintah kerja

17
lms/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_zh_CN.properties Normal file
View File

@@ -0,0 +1,17 @@
dept_has=部门存在绑定的人员，请先解绑人员对应部门
device_check=设备编号不能为空
genrator_cfg=请先配置生成器
material_cfg=物料{0}配置信息异常,请维护
material_check=物料ID{0}不存在
material_notEq=物料不一致
menu_url=外链必须以http\://或者https\://开头
per_auth=存在关联的数据权限，请解除关联后删除
point_checkNull=点位不能为空
point_checkNull_1=起点或终点不能同时为空
quartz_check=子任务中不能添加当前任务ID
role_Check_1=角色名字不能为空
task_isNull=任务信息不存在{0}
task_statusWrong=任务已完成或已取消
vehicle_check=载具编码不能为空
vehicle_check_1=载具{0}组盘信息不存在
workorder_checkRun=该设备{0}不在生产中的工单

18
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error.properties
View File

@@ -0,0 +1,18 @@
error_AccessLimit=访问次数限制\!
error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
error_Config=配置信息不正确
error_Create=创建失败
error_File_1=文件超出规定大小\!
error_File_2=只能上传图片
error_File_3=上传失败
error_LockOut=操作锁被占用{0},等待结束
error_NotEq=参数校验异常：信息不一致
error_NullPoint=信息为空
error_NumberError_1=长度不是偶数\!
error_ParamError=参数不正确
error_ParamExist=信息已经存在{0}
error_Point=点位错误
error_Send=消息发送失败
error_SystemAuthError=权限不足，操作失败
error_SystemError=系统繁忙，稍后在试
error_isNull={0}查询信息不存在

18
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_en_US.properties
View File

@@ -0,0 +1,18 @@
error_AccessLimit=Access limit\!
error_CodeGenerator=This environment does not allow code generation. Please choose to preview or download to view
error_Config=Incorrect configuration information
error_Create=Creation failed
error_File_1=The file exceeds the specified size\!
error_File_2=Only uploadable images
error_File_3=Upload failed
error_LockOut=Operation lock is occupied {0}, waiting for end
error_NotEq=Parameter verification exception\: inconsistent information
error_NullPoint=Only Empty Question
error_NumberError_1=It's not even long\!
error_ParamError=invalid parameter
error_ParamExist=Parameter already exists {0}
error_Point=point error
error_Send=Message sending failed
error_SystemAuthError=Insufficient permissions, operation failed
error_SystemError=The system is busy, please try again later
error_isNull={0}query is null

18
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties
View File

@@ -0,0 +1,18 @@
error_AccessLimit=Batas akses\!
error_CodeGenerator=lingkungan ini tidak memungkinkan generasi kode. Silakan pilih untuk melihat atau mengunduh untuk melihat
error_Config=Informasi konfigurasi yang salah
error_Create=Penciptaan gagal
error_File_1=Berkas melebihi ukuran yang ditentukan\!
error_File_2=Hanya gambar yang dapat diunggah
error_File_3=Upload gagal
error_LockOut=Operasi kunci sedang sibuk {0}, menunggu akhir
error_NotEq=Pengecualian verifikasi parameter\: informasi yang tidak konsisten
error_NullPoint=Pertanyaan Hanya Kosong
error_NumberError_1=Panjangnya bahkan tidak\!
error_ParamError=parameter tidak benar
error_ParamExist=Parameter sudah ada {0}
error_Point=Kesalahan titik
error_Send=Pengiriman pesan gagal
error_SystemAuthError=Keizinan tidak cukup, operasi gagal
error_SystemError=Sistemnya sibuk, tolong coba lagi nanti
error_isNull={0}Pertanyaan Tidak ada

18
lms/nladmin-system/nlsso-server/src/main/resources/language/error/error_zh_CN.properties
View File

@@ -0,0 +1,18 @@
error_AccessLimit=访问次数限制\!
error_CodeGenerator=此环境不允许生成代码，请选择预览或者下载查看
error_Config=配置信息不正确
error_Create=创建失败
error_File_1=文件超出规定大小\!
error_File_2=只能上传图片
error_File_3=上传失败
error_LockOut=操作锁被占用{0},等待结束
error_NotEq=参数校验异常：信息不一致
error_NullPoint=信息为空
error_NumberError_1=长度不是偶数\!
error_ParamError=参数不正确
error_ParamExist=信息已经存在{0}
error_Point=点位错误
error_Send=消息发送失败
error_SystemAuthError=权限不足，操作失败
error_SystemError=系统繁忙，稍后在试
error_isNull={0}查询信息不存在

8
lms/nladmin-system/nlsso-server/src/main/resources/language/login/login.properties
View File

@@ -1 +1,7 @@
code=default
login_CodeError=验证码配置信息错误！
login_CodeNull=验证码不存在或者过期
login_account=账号未激活
login_childError=上级不能为自己或自己的下级
login_pwd=账号或者密码不正确
login_pwd_1=修改失败，旧密码错误
login_pwd_2=新密码不能与旧密码相同

8
lms/nladmin-system/nlsso-server/src/main/resources/language/login/login_en_US.properties
View File

@@ -1 +1,7 @@
code=us
login_CodeError=Verification code configuration information error\!
login_CodeNull=The verification code does not exist or has expired
login_account=Account not activated
login_childError=The superior cannot act for themselves
login_pwd=Incorrect account or password
login_pwd_1=Modification failed, old password error
login_pwd_2=The new password cannot be the same as the old password

8
lms/nladmin-system/nlsso-server/src/main/resources/language/login/login_id_ID.properties
View File

@@ -1 +1,7 @@
code=yinni
login_CodeError=Galat konfigurasi kode verifikasi\!
login_CodeNull=Kode verifikasi tidak ada atau sudah habis
login_account=Akaun tidak diaktifkan
login_childError=Atasan tidak bisa bertindak untuk diri mereka sendiri
login_pwd=Akaun atau kata sandi yang salah
login_pwd_1=Modifikasi gagal, kesalahan kata sandi lama
login_pwd_2=Kata sandi baru tidak dapat sama dengan kata sandi lama

8
lms/nladmin-system/nlsso-server/src/main/resources/language/login/login_zh_CN.properties
View File

@@ -1 +1,7 @@
code=cn
login_CodeError=验证码配置信息错误！
login_CodeNull=验证码不存在或者过期
login_account=账号未激活
login_childError=上级不能为自己或自己的下级
login_pwd=账号或者密码不正确
login_pwd_1=修改失败，旧密码错误
login_pwd_2=新密码不能与旧密码相同

2
lms/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl
View File

@@ -59,7 +59,7 @@ public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${c
@Override
public void update(${className} entity) {
${className} dto = ${changeClassName}Mapper.selectById(entity.get${pkChangeColName ? cap_first }());
if (dto == null) throw new BadRequestException("被删除或无权限，操作失败!");
if (dto == null) throw new BadRequestException(LangProcess.msg("error_SystemAuthError"));
String currentUserId = SecurityUtils.getCurrentUserId();
String nickName = SecurityUtils.getCurrentNickName();

9
lms/nladmin-system/nlsso-server/src/test/java/org/nl/task/MapperTest.java
View File

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.junit.jupiter.api.Test;
import org.nl.common.exception.BadRequestException;
import org.nl.config.MapOf;
import org.nl.config.language.LangProcess;
import org.nl.wms.sch.point.service.ISchBasePointService;
import org.nl.wms.sch.point.service.dao.SchBasePoint;
import org.nl.wms.util.test.mapper.TestMapper;
@@ -181,12 +182,12 @@ public class MapperTest {
for (int i = 0; i < 5; i++) {
// 参数处理
if (i == 1) {
throw new BadRequestException("出错了 - 1");
throw new BadRequestException(LangProcess.msg("error_SystemError"));
}
try {
// 创建
if (i == 2) {
throw new BadRequestException("出错了 - 2");
throw new BadRequestException(LangProcess.msg("error_SystemError"));
}
}catch (Exception e) {
// 记录
@@ -208,11 +209,11 @@ public class MapperTest {
try {
// 参数处理
if (i == 1) {
throw new BadRequestException("出错了 - 1");
throw new BadRequestException(LangProcess.msg("error_SystemError"));
}
// 创建任务
if (i == 2) {
throw new BadRequestException("出错了 - 2");
throw new BadRequestException(LangProcess.msg("error_SystemError"));
}
// 成功