From 70652a6bfa8d6df7ed7adc6357dffa70738b1255 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Mon, 27 Nov 2023 19:12:18 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AddressServiceImpl.java | 5 ++- .../agv/server/impl/MagicAgvServiceImpl.java | 7 +-- .../server/impl/XianGongAgvServiceImpl.java | 5 ++- .../main/java/org/nl/acs/auto/AcsInit.java | 2 + .../nl/acs/auto/run/AutoRunServiceImpl.java | 10 +++-- .../impl/DeviceErpmappingServiceImpl.java | 2 +- .../service/impl/DeviceExtraServiceImpl.java | 2 +- .../service/impl/DeviceServiceImpl.java | 29 ++++++------ .../OvenGantryManipulatorDeviceDriver.java | 19 ++++---- .../main/java/org/nl/acs/ext/wms/AcsUtil.java | 3 +- .../wms/service/impl/WmsToAcsServiceImpl.java | 5 ++- .../service/impl/InstructionServiceImpl.java | 22 +++++----- .../src/main/java/org/nl/acs/opc/OpcUtl.java | 3 +- .../acs/opc/service/impl/OpcServiceImpl.java | 2 +- .../service/impl/RouteLineServiceImpl.java | 2 +- .../service/impl/RouteLocServiceImpl.java | 2 +- .../service/impl/RoutePlanServiceImpl.java | 2 +- .../org/nl/acs/socket/ClientUDWReceive.java | 3 +- .../service/impl/StorageCellServiceImpl.java | 2 +- .../service/impl/TaskFeedbackServiceImpl.java | 3 +- .../task/service/impl/TaskServiceImpl.java | 29 ++++++------ .../main/java/org/nl/acs/utils/ReadUtil.java | 3 +- .../org/nl/common/aspect/LimitAspect.java | 3 +- .../java/org/nl/common/utils/FileUtil.java | 3 +- .../controller/dept/DeptController.java | 3 +- .../generator/CodeGeneratorController.java | 6 ++- .../controller/user/UserController.java | 9 ++-- .../service/dept/impl/SysDeptServiceImpl.java | 3 +- .../service/dict/impl/SysDictServiceImpl.java | 23 ++++++---- .../impl/CodeGeneratorServiceImpl.java | 11 ++--- .../logicflow/impl/StageImageServiceImpl.java | 2 +- .../logicflow/impl/StageServiceImpl.java | 2 +- .../notice/impl/SysNoticeServiceImpl.java | 10 +++-- .../param/impl/SysParamServiceImpl.java | 2 +- .../impl/SysDataPermissionServiceImpl.java | 9 ++-- .../service/quartz/config/JobRunner.java | 2 + .../quartz/impl/SysQuartzJobServiceImpl.java | 8 ++-- .../service/quartz/utils/QuartzManage.java | 13 +++--- .../service/role/impl/SysRoleServiceImpl.java | 9 ++-- .../secutiry/impl/OnlineUserService.java | 9 ++-- .../impl/ToolLocalStorageServiceImpl.java | 5 ++- .../resources/language/buss/buss.properties | 26 +++-------- .../language/buss/buss_en_US.properties | 26 +++-------- .../language/buss/buss_id_ID.properties | 20 --------- .../language/buss/buss_in_ID.properties | 26 +++-------- .../language/buss/buss_zh_CN.properties | 26 +++-------- .../resources/language/error/error.properties | 44 ++++++++++--------- .../language/error/error_en_US.properties | 44 ++++++++++--------- .../language/error/error_id_ID.properties | 21 --------- .../language/error/error_in_ID.properties | 44 ++++++++++--------- .../language/error/error_zh_CN.properties | 44 ++++++++++--------- .../resources/language/login/login.properties | 10 ++--- .../language/login/login_en_US.properties | 10 ++--- .../language/login/login_id_ID.properties | 7 --- .../language/login/login_in_ID.properties | 10 ++--- .../language/login/login_zh_CN.properties | 10 ++--- .../resources/language/task/task.properties | 4 ++ .../language/task/task_en_US.properties | 4 ++ .../language/task/task_in_ID.properties | 4 ++ .../language/task/task_zh_CN.properties | 4 ++ .../template/generator/admin/ServiceImpl.ftl | 2 +- 61 files changed, 327 insertions(+), 353 deletions(-) delete mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/buss/buss_id_ID.properties delete mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/error/error_id_ID.properties delete mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/login/login_id_ID.properties create mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/task/task.properties create mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_en_US.properties create mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_in_ID.properties create mode 100644 acs/nladmin-system/nlsso-server/src/main/resources/language/task/task_zh_CN.properties diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java index a902d50..6653361 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/address/service/impl/AddressServiceImpl.java @@ -23,6 +23,7 @@ import org.nl.acs.address.service.AddressService; import org.nl.acs.address.service.dto.AddressDto; import org.nl.acs.address.service.dto.AddressQueryParam; import org.nl.acs.address.service.mapper.AddressMapper; +import org.nl.config.language.LangProcess; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -200,7 +201,7 @@ public class AddressServiceImpl extends CommonServiceImpl i String device_code = dto.getDevice_code(); DeviceDto deviceDto = this.findByCode(device_code); if (deviceDto != null && deviceDto.getIs_delete().equals("0")) { - throw new BadRequestException("存在相同的设备编码"); + throw new BadRequestException(LangProcess.msg("error_checkExist",device_code)); } String currentUsername = SecurityUtils.getCurrentUsername(); @@ -311,14 +312,14 @@ public class DeviceServiceImpl extends CommonServiceImpl i public void update(DeviceDto dto) { DeviceDto entity = this.findById(dto.getDevice_id()); if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } String device_code = dto.getDevice_code(); DeviceDto deviceDto = this.findByCode(device_code); if (deviceDto != null && deviceDto.getIs_delete().equals("0") && !deviceDto.getDevice_id().equals(dto.getDevice_id())) { - throw new BadRequestException("存在相同的设备编码"); + throw new BadRequestException(LangProcess.msg("error_checkExist",device_code)); } String currentUsername = SecurityUtils.getCurrentUsername(); @@ -356,7 +357,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i .or().eq(RouteLine::getNext_device_code,device_code) .one(); if (json != null) { - throw new BadRequestException("设备：【" + device_code + "】在路由已存在，无法删除!"); + throw new BadRequestException(LangProcess.msg("device_checkRoute",device_code)); } log.debug("删除舞台里面的设备!"); // Map map = new HashMap<>(); @@ -860,7 +861,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i String driver_code = parentForm.getString("driver_code"); if (StrUtil.isEmpty(device_id)) { - throw new BadRequestException("设备标识不能为空!"); + throw new BadRequestException(LangProcess.msg("error_checkNull","device_id")); } log.info("更新设备主表信息"); @@ -1097,7 +1098,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i } Device device = deviceAppService.findDeviceByCode(device_code); if (ObjectUtil.isEmpty(device)) { - throw new BadRequestException("未找到对应设备:" + device_code); + throw new BadRequestException(LangProcess.msg("error_isNull",device_code)); } StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; SlitTwoManipulatorDeviceDriver slitTwoManipulatorDeviceDriver; @@ -1215,14 +1216,14 @@ public class DeviceServiceImpl extends CommonServiceImpl i String material_type = form.getString("material_type"); String remark = form.getString("remark"); if (StrUtil.isEmpty(quantity) || StrUtil.isEmpty(material_type)) { - throw new BadRequestException("数量及物料不可为空，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_checkNull","quantity or material_type")); } Device device = deviceAppService.findDeviceByCode(device_code); StandardOrdinarySiteDeviceDriver standardOrdinarySiteDeviceDriver; if (device.getDeviceDriver() instanceof StandardOrdinarySiteDeviceDriver) { standardOrdinarySiteDeviceDriver = (StandardOrdinarySiteDeviceDriver) device.getDeviceDriver(); if (standardOrdinarySiteDeviceDriver.getBranchProtocol() == 2) { - throw new BadRequestException("该设备已有呼叫请求未响应，操作失败!"); + throw new BadRequestException(LangProcess.msg("device_checkStatus")); } else { standardOrdinarySiteDeviceDriver.setBranchProtocol(2); standardOrdinarySiteDeviceDriver.setQty(quantity); @@ -1633,7 +1634,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i //校验数据 格式为： RD1.RD1.A1.mode int num = countStr(extra_code, "."); if (num != 3) { - throw new BadRequestException(extra_code + "数据格式不正确"); + throw new BadRequestException(LangProcess.msg("error_config",extra_code)); } extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length()); @@ -1703,7 +1704,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i //校验数据 格式为： RD1.RD1.A1.mode int num = countStr(extra_code, "."); if (num != 3) { - throw new BadRequestException(extra_code + "数据格式不正确"); + throw new BadRequestException(LangProcess.msg("error_config",extra_code)); } extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length()); @@ -2062,7 +2063,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i //校验数据 格式为： RD1.RD1.A1.mode int num = countStr(extra_code, "."); if (num != 3) { - throw new BadRequestException(extra_code + "数据格式不正确"); + throw new BadRequestException(LangProcess.msg("error_config",extra_code)); } extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length()); @@ -2107,7 +2108,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i //校验数据 格式为： RD1.RD1.A1.mode int num = countStr(extra_code, "."); if (num != 3) { - throw new BadRequestException(extra_code + "数据格式不正确"); + throw new BadRequestException(LangProcess.msg("error_config",extra_code)); } extra_code = extra_code.substring(extra_code.indexOf(".") + 1, extra_code.length()); @@ -2144,7 +2145,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i @Transactional(rollbackFor = Exception.class) public void excelImport(MultipartFile file, HttpServletRequest request) { if (file.isEmpty()) { - throw new BadRequestException("文件为空,请添加数据后重新导入"); + throw new BadRequestException(LangProcess.msg("error_nullPoint")); } Long currentUserId = Long.valueOf(SecurityUtils.getCurrentUserId()); String nickName = SecurityUtils.getCurrentNickName(); @@ -2173,7 +2174,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i String is_route = list.get(4).toString(); String region = list.get(5).toString(); if (StrUtil.isEmpty(device_code)) { - throw new BadRequestException("设备编号为空!"); + throw new BadRequestException(LangProcess.msg("error_checkNull","device_code")); } if (StrUtil.isEmpty(device_name)) { device_name = device_code; diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java index 7f51d40..3b938f3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java @@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject; import lombok.Data; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Lang; import org.nl.acs.device.domain.Device; import org.nl.acs.device.service.DeviceService; import org.nl.acs.device_driver.DeviceDriver; @@ -29,6 +30,7 @@ import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; import org.openscada.opc.lib.da.Server; import org.springframework.beans.factory.annotation.Autowired; @@ -516,10 +518,10 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i Device startDevice = deviceAppService.findDeviceByCode(start_device_code); Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); if (ObjectUtil.isEmpty(startDevice.getExtraValue().get("address"))) { - throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！"); + throw new BadRequestException(LangProcess.msg("device_checkAdd",startDevice.getDevice_code())); } if (ObjectUtil.isEmpty(nextDevice.getExtraValue().get("address"))) { - throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); + throw new BadRequestException(LangProcess.msg("device_checkAdd",nextDevice.getDevice_code())); } String start_addr = startDevice.getExtraValue().get("address").toString(); String next_addr = nextDevice.getExtraValue().get("address").toString(); @@ -596,12 +598,13 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i if (ObjectUtil.isEmpty(startDevice.getExtraValue().get("address"))) { notCreateInstMessage = "设备：" + startDevice.getDevice_code() + "未设置电气调度号！"; logServer.deviceExecuteLog(this.getDevice_code(), "", "", "设备：" + startDevice.getDevice_code() + "未设置电气调度号！"); - throw new BadRequestException("设备：" + startDevice.getDevice_code() + "未设置电气调度号！"); + throw new BadRequestException(LangProcess.msg("device_checkAdd",startDevice.getDevice_code())); } if (ObjectUtil.isEmpty(nextDevice.getExtraValue().get("address"))) { notCreateInstMessage = "设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"; logServer.deviceExecuteLog(this.getDevice_code(), "", "", "设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); - throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！"); + throw new BadRequestException(LangProcess.msg("device_checkAdd",nextDevice.getDevice_code())); + } String start_addr = startDevice.getExtraValue().get("address").toString(); String next_addr = nextDevice.getExtraValue().get("address").toString(); @@ -667,7 +670,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i Device nextDevice = deviceAppService.findDeviceByCode(next_device_code); HongXiangConveyorDeviceDriver hongXiangConveyorDeviceDriver; if (ObjectUtil.isEmpty(startDevice)) { - throw new BadRequestException("设备号:" + start_device_code + "不存在！"); + throw new BadRequestException(LangProcess.msg("error_isNull",start_device_code)); } if (startDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startDevice.getDeviceDriver(); @@ -676,7 +679,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i for (String deviceCode : deviceCodes) { Device linkDevice = deviceAppService.findDeviceByCode(deviceCode); if (ObjectUtil.isEmpty(linkDevice)) { - throw new BadRequestException("设备:" + start_device_code + "关联设备->" + deviceCode + "为空！"); + throw new BadRequestException(LangProcess.msg("device_checkrelate",start_device_code,deviceCode,"is null")); } if (linkDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) linkDevice.getDeviceDriver(); @@ -692,7 +695,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i } } if (ObjectUtil.isEmpty(nextDevice)) { - throw new BadRequestException("设备号:" + next_device_code + "不存在！"); + throw new BadRequestException(LangProcess.msg("error_isNull",next_device_code)); } if (nextDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextDevice.getDeviceDriver(); @@ -701,7 +704,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i for (String deviceCode : deviceCodes) { Device linkDevice = deviceAppService.findDeviceByCode(deviceCode); if (ObjectUtil.isEmpty(linkDevice)) { - throw new BadRequestException("设备:" + next_device_code + "关联设备->" + deviceCode + "为空！"); + throw new BadRequestException(LangProcess.msg("device_checkrelate",next_device_code,deviceCode,"is null")); } if (linkDevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) { hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) linkDevice.getDeviceDriver(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java index df5b030..43e9b85 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/AcsUtil.java @@ -10,6 +10,7 @@ import org.nl.acs.log.LokiLog; import org.nl.acs.log.LokiLogType; import org.nl.acs.log.service.DeviceExecuteLogService; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; @@ -28,7 +29,7 @@ public class AcsUtil { //判断是否连接立库WCS系统 String isConnect = paramService.findByCode("is_connect_liKu_Wcs").getValue(); if (StrUtil.equals("0", isConnect)) { - throw new BadRequestException("参数配置表中-is_connect_liKu_Wcs为:0"); + throw new BadRequestException(LangProcess.msg("error_config")); } String liKu_wcs_url = paramService.findByCode("liKu_wcs_url").getValue(); try { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java index a09e04d..8231e25 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java @@ -31,6 +31,7 @@ import org.nl.acs.storage_cell.service.mapper.StorageCellMapper; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; import org.nl.common.exception.BadRequestException; +import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.config.SpringContextHolder; @@ -74,7 +75,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { String vehicle_code = request.getVehicle_code(); Map params = request.getParams(); if (StrUtil.isEmpty(task_code)) { - throw new BadRequestException("任务号不能为空"); + throw new BadRequestException(LangProcess.msg("error_checkNull","task_code")); } TaskDto taskDto = taskService.findByCodeFromCache(task_code); String cancelTaskCheck = paramService.findByCode(AcsConfig.CANCELTASKCHECK).getValue(); @@ -194,7 +195,7 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { StandardCoveyorControlWithScannerDeviceDriver standardCoveyorControlWithScannerDeviceDriver; if (datas.size() == 0) { - throw new BadRequestException("缺少输入参数！"); + throw new BadRequestException(LangProcess.msg("error_nullPoint")); } for (int i = 0; i < datas.size(); i++) { diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 7defbbf..be9ff62 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -58,6 +58,7 @@ import org.nl.acs.instruction.domain.Instruction; import org.nl.acs.instruction.service.InstructionService; import org.nl.acs.instruction.service.mapper.InstructionMapper; import org.nl.common.utils.SecurityUtils; +import org.nl.config.language.LangProcess; import org.nl.system.service.param.ISysParamService; import org.nl.common.utils.CodeUtil; import org.nl.config.SpringContextHolder; @@ -451,7 +452,7 @@ public class InstructionServiceImpl extends CommonServiceImpl"); @@ -983,7 +985,7 @@ public class InstructionServiceImpl extends CommonServiceImpl implements @Transactional(rollbackFor = Exception.class) public void update(OpcDto dto) { OpcDto entity = this.findById(dto.getOpc_id()); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) throw new BadRequestException(LangProcess.msg("error_sysAuth")); String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); dto.setUpdate_time(now); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java index 25c0dbc..9206641 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java @@ -352,7 +352,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl impleme if (!StrUtil.isEmpty(dto.getVehicle_code())) { TaskDto vehicle_dto = this.findByContainer(dto.getVehicle_code()); if (vehicle_dto != null) { - throw new BadRequestException("已存在该载具号的任务!"); + throw new BadRequestException(LangProcess.msg("task_checkExist",dto.getVehicle_code())); } } String currentUsername = SecurityUtils.getCurrentUsername(); @@ -775,7 +776,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme next_device_code = jo.get("next_device_code").toString(); } if (ObjectUtil.isNotEmpty(this.findByStartCode(device_code))) { - throw new BadRequestException("已存在该起点的任务!"); + throw new BadRequestException(LangProcess.msg("task_checkExist",device_code)); } if (StrUtil.equals(material_type, "") || StrUtil.equals(quantity, "")) { throw new RuntimeException("请填写物料信息!"); @@ -840,10 +841,10 @@ public class TaskServiceImpl extends CommonServiceImpl impleme if (ObjectUtil.isNotEmpty(this.findByStartCode(start_device_code)) || ObjectUtil.isNotEmpty(this.findByNextCode(next_device_code))) { - throw new BadRequestException("已存在该起点或终点的任务!"); + throw new BadRequestException(LangProcess.msg("task_checkExist",start_device_code+" or "+next_device_code)); } if (StrUtil.equals(material_type, "") || StrUtil.equals(quantity, "")) { - throw new RuntimeException("请填写物料信息!"); + throw new BadRequestException(LangProcess.msg("error_checkNull","quantity or material_type")); } dto.setRoute_plan_code("two"); dto.setStart_device_code(start_device_code); @@ -862,7 +863,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme TaskDto entity = this.findById(dto.getTask_id()); if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } String currentUsername = SecurityUtils.getCurrentUsername(); @@ -922,10 +923,10 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Transactional(rollbackFor = Exception.class) public void finish(String id) { TaskDto entity = this.findById(id); - if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); + if (entity == null) throw new BadRequestException(LangProcess.msg("error_sysAuth")); InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); - if (instdto != null) throw new BadRequestException("有指令未完成!"); + if (instdto != null) throw new BadRequestException(LangProcess.msg("task_insHas")); String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); entity.setUpdate_time(now); @@ -973,12 +974,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public void cancel(String id) throws Exception { TaskDto entity = this.findById(id); if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); if (instdto != null) { - throw new BadRequestException("有指令未完成!"); + throw new BadRequestException(LangProcess.msg("task_insRun")); } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); @@ -1042,12 +1043,12 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public void cancelNoSendWms(String id) throws Exception { TaskDto entity = this.findById(id); if (entity == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); InstructionDto instdto = instructionservice.findByTaskid(id, "instruction_status <2 "); if (instdto != null) { - throw new BadRequestException("有指令未完成!"); + throw new BadRequestException(LangProcess.msg("task_insRun")); } String currentUsername = SecurityUtils.getCurrentUsername(); String now = DateUtil.now(); @@ -1090,7 +1091,7 @@ public class TaskServiceImpl extends CommonServiceImpl impleme @Override public Instruction createTemporaryInst(TaskDto acsTask) { if (acsTask == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } acsTask = foramte(acsTask); ISysParamService paramService = SpringContextHolder.getBean(ISysParamService.class); @@ -1221,13 +1222,13 @@ public class TaskServiceImpl extends CommonServiceImpl impleme public Instruction createInst(String ids) throws Exception { TaskDto acsTask = this.findById(ids); if (acsTask == null) { - throw new BadRequestException("被删除或无权限，操作失败!"); + throw new BadRequestException(LangProcess.msg("error_sysAuth")); } DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); InstructionService instructionservice = SpringContextHolder.getBean("instructionServiceImpl"); InstructionDto inst = instructionservice.findByTaskid(ids, "instruction_status < 2 "); if (inst != null) { - throw new BadRequestException("有指令未完成!"); + throw new BadRequestException(LangProcess.msg("task_insRun")); } String taskid = acsTask.getTask_id(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java index 2236192..ecb4a06 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/utils/ReadUtil.java @@ -14,6 +14,7 @@ import org.nl.acs.opc.domain.Opc; import org.nl.acs.opc.service.mapper.OpcMapper; import org.nl.common.exception.BadRequestException; import org.nl.config.SpringContextHolder; +import org.nl.config.language.LangProcess; import org.openscada.opc.dcom.list.ClassDetails; import org.openscada.opc.lib.common.AlreadyConnectedException; import org.openscada.opc.lib.common.ConnectionInformation; @@ -151,7 +152,7 @@ public class ReadUtil { return listResult; } catch (UnknownHostException | JIException | IllegalArgumentException e) { log.error("连接异常{}",e,e.getMessage()); - throw new BadRequestException("用户名或密码错误"); + throw new BadRequestException(LangProcess.msg("login_pwdWrong")); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java index a669c5e..43ba0a6 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java +++ b/acs/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_sysLimit")); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java index 3ecc405..e2dac4e 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java +++ b/acs/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_checkFileSize")); } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index a576223..5126d87 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/acs/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/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index cc48b9d..9d204e0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -3,9 +3,11 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Lang; 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 +74,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("执行失败")); } switch (type){ // 生成代码 @@ -83,7 +85,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_config")); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index c9204a5..bc3d952 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/acs/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_sysAuth")); } 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_pwdWrong_1")); } if (!SaSecureUtil.md5BySalt(user.getPassword(), "salt").equals(SaSecureUtil.md5BySalt(newPass, "salt"))) { - throw new BadRequestException("新密码不能与旧密码相同"); + throw new BadRequestException(LangProcess.msg("login_pwdWrong_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_pwdWrong")); } userService.update(new UpdateWrapper().set(userInfo.getUsername(),user.getEmail())); return new ResponseEntity<>(HttpStatus.OK); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index 93ea266..18b287c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/acs/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("error_checkRelate")); } } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index ae50dfb..0d0ec2c 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.apache.ibatis.annotations.Lang; 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; @@ -39,7 +41,9 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Override public IPage queryAll(Map whereJson, PageQuery page) { String blurry = null; - if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) blurry = whereJson.get("blurry").toString(); + if (ObjectUtil.isNotEmpty(whereJson.get("blurry"))) { + blurry = whereJson.get("blurry").toString(); + } IPage pages = this.page(new Page<>(page.getPage() + 1, page.getSize()), new QueryWrapper() .select("MAX(dict_id) AS dict_id, code, name") .lambda() @@ -59,7 +63,9 @@ 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_checkExist",dict.getCode())); + } dict.setDict_id(IdUtil.getSnowflake(1, 1).nextIdStr()); dict.setCreate_id(currentUserId); dict.setCreate_name(nickName); @@ -75,11 +81,12 @@ 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_isNull",dto.getDict_id())); } 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() + "]已存在"); + if (ObjectUtil.isNotEmpty(dictList) && !dto.getCode().equals(dict.getCode())) { + throw new BadRequestException(LangProcess.msg("error_checkExist",dto.getCode())); + } String currentUserId = SecurityUtils.getCurrentUserId(); String currentNickName = SecurityUtils.getCurrentNickName(); // 根据code获取所有字典 @@ -130,7 +137,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_checkExist",dict.getLabel())); // 判断是否有空的值 List selectOne = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); Dict dic = selectOne.get(0); @@ -165,13 +172,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_sysAuth")); } // 校验是否已经有标签 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_checkExist",resources.getLabel())); } resources.setUpdate_id(SecurityUtils.getCurrentUserId()); resources.setUpdate_name(SecurityUtils.getCurrentNickName()); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java index d3c7ced..d70b0b3 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGeneratorServiceImpl.java +++ b/acs/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; @@ -141,7 +142,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("error_config")); } List> genList = GenUtil.preview(columnsRecords, genConfig); return new ResponseEntity<>(genList, HttpStatus.OK); @@ -151,7 +152,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("error_config")); } try { File file = new File(GenUtil.download(columns, genConfig)); @@ -159,7 +160,7 @@ public class CodeGeneratorServiceImpl extends ServiceImpl columnsPage) { List columns = columnsPage.getRecords(); if (genConfig.getConfig_id() == null) { - throw new BadRequestException("请先配置生成器"); + throw new BadRequestException(LangProcess.msg("error_config")); } try { GenUtil.generatorCode(columns, genConfig); } catch (IOException e) { log.error(e.getMessage(), e); - throw new BadRequestException("生成失败，请手动处理已生成的文件"); + throw new BadRequestException(LangProcess.msg("error_sys")); } } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java index 14b40a6..82e55db 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageImageServiceImpl.java @@ -61,7 +61,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_sysAuth")); String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java index 0f3b62b..780a680 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/impl/StageServiceImpl.java @@ -65,7 +65,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_sysAuth")); String currentUsername = SecurityUtils.getCurrentUsername(); String currentUserId = SecurityUtils.getCurrentUserId(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java index 5e851a7..42c9b67 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java @@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.apache.ibatis.annotations.Lang; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.NoticeEnum; import org.nl.common.exception.BadRequestException; @@ -19,6 +20,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; @@ -83,7 +85,7 @@ public class SysNoticeServiceImpl 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_sysAuth")); } Param param1 = paramMapper.selectOne(new LambdaQueryWrapper().eq(Param::getCode, param.getCode()) .and(lam -> lam.ne(Param::getId, param.getId()))); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java index cdee996..72df3af 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/impl/SysDataPermissionServiceImpl.java +++ b/acs/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; @@ -55,7 +56,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl().eq(SysDataPermission::getCode, permission.getCode())); - if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException("编码为[" + permission.getCode() + "]的数据权限已存在"); + if (ObjectUtil.isNotEmpty(sysDataPermission)) throw new BadRequestException(LangProcess.msg("error_checkExist",permission.getCode())); String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -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("error_checkRelate")); dataPermissionMapper.deleteById(id); }); } @@ -126,7 +127,7 @@ public class SysDataPermissionServiceImpl extends ServiceImpl tasks = Arrays.asList(resources.getSub_task().split("[,，]")); if (tasks.contains(resources.getJob_id())) { - throw new BadRequestException("子任务中不能添加当前任务ID"); + throw new BadRequestException(LangProcess.msg("login_childError")); } } resources.setUpdate_id(SecurityUtils.getCurrentUserId()); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java index f51adc7..f7858b7 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/utils/QuartzManage.java +++ b/acs/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_dbCreate")); } } @@ -82,7 +83,7 @@ public class QuartzManage { } } catch (Exception e){ log.error("更新定时任务失败", e); - throw new BadRequestException("更新定时任务失败"); + throw new BadRequestException(LangProcess.msg("error_dbUpdate")); } } @@ -102,7 +103,7 @@ public class QuartzManage { scheduler.resumeJob(jobKey); } catch (Exception e){ log.error("恢复定时任务失败", e); - throw new BadRequestException("恢复定时任务失败"); + throw new BadRequestException(LangProcess.msg("error_dbUpdate")); } } @@ -116,7 +117,7 @@ public class QuartzManage { scheduler.pauseJob(jobKey); } catch (Exception e){ log.error("定时任务暂停失败", e); - throw new BadRequestException("定时任务暂停失败"); + throw new BadRequestException(LangProcess.msg("error_dbUpdate")); } } @@ -138,7 +139,7 @@ public class QuartzManage { scheduler.triggerJob(jobKey,dataMap); } catch (Exception e){ log.error("定时任务执行失败", e); - throw new BadRequestException("定时任务执行失败"); + throw new BadRequestException(LangProcess.msg("error_run")); } } @@ -153,7 +154,7 @@ public class QuartzManage { scheduler.deleteJob(jobKey); } catch (Exception e){ log.error("删除定时任务失败", e); - throw new BadRequestException("删除定时任务失败"); + throw new BadRequestException(LangProcess.msg("error_dbDelete")); } } } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 70edee8..7f8de35 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/acs/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("error_nullPoint")); 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_checkExist",name)); String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -85,12 +86,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("error_nullPoint")); //判断角色名字是否存在 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_checkExist",name)); String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index b63ef55..f1ce9d0 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -28,6 +28,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.secutiry.dto.UserDto; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.secutiry.dto.AuthUserDto; @@ -220,16 +221,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_pwdWrong")); } // 获取权限列表 - 登录查找权限 @@ -237,7 +238,7 @@ public class OnlineUserService { if (!userInfo.getIs_used()) { - throw new BadRequestException("账号未激活"); + throw new BadRequestException(LangProcess.msg("login_account")); } // 登录输入，登出删除 diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java index 4a49142..ce19786 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java +++ b/acs/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