refactor: 异常提示信息汉化

云中非
1 parent bf4fa8bc
Showing 4 changed files with 25 additions and 25 deletions
application/src/main/java/org/thingsboard/server/controller/BaseController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/YtMenuController.java
application/src/main/java/org/thingsboard/server/controller/yunteng/aspect/OperateLogAspect.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/RoleServiceImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @3d32d11
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
View file @3d32d11
@@ -331,7 +331,7 @@ public abstract class BaseController {
     }
     <T> T checkNotNull(Optional<T> reference) throws ThingsboardException {
-        return checkNotNull(reference, "Requested item wasn't found!");
+        return checkNotNull(reference, "请求的内容不存在!");
     }
     <T> T checkNotNull(Optional<T> reference, String notFoundMessage) throws ThingsboardException {
@@ -344,13 +344,13 @@ public abstract class BaseController {
     void checkParameter(String name, String param) throws ThingsboardException {
         if (StringUtils.isEmpty(param)) {
-            throw new ThingsboardException("Parameter '" + name + "' can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            throw new ThingsboardException("参数【 " + name + "】不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         }
     }
     void checkArrayParameter(String name, String[] params) throws ThingsboardException {
         if (params == null || params.length == 0) {
-            throw new ThingsboardException("Parameter '" + name + "' can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            throw new ThingsboardException("参数【 " + name + "】不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
         } else {
             for (String param : params) {
                 checkParameter(name, param);
@@ -369,7 +369,7 @@ public abstract class BaseController {
                 try {
                     direction = SortOrder.Direction.valueOf(sortOrder.toUpperCase());
                 } catch (IllegalArgumentException e) {
-                    throw new ThingsboardException("Unsupported sort order '" + sortOrder + "'! Only 'ASC' or 'DESC' types are allowed.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                    throw new ThingsboardException("不支持的排序规则【" + sortOrder + "】!只支持 'ASC' 或 'DESC'.", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
                 }
             }
             SortOrder sort = new SortOrder(sortProperty, direction);
@@ -390,7 +390,7 @@ public abstract class BaseController {
         if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
             return (SecurityUser) authentication.getPrincipal();
         } else {
-            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+            throw new ThingsboardException("你没有权限执行改操作!", ThingsboardErrorCode.AUTHENTICATION);
         }
     }
@@ -398,7 +398,7 @@ public abstract class BaseController {
         try {
             validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
             Tenant tenant = tenantService.findTenantById(tenantId);
-            checkNotNull(tenant, "Tenant with id [" + tenantId + "] is not found");
+            checkNotNull(tenant, "ID【" + tenantId + "】相关的租户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation, tenantId, tenant);
             return tenant;
         } catch (Exception e) {
@@ -410,7 +410,7 @@ public abstract class BaseController {
         try {
             validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
             TenantInfo tenant = tenantService.findTenantInfoById(tenantId);
-            checkNotNull(tenant, "Tenant with id [" + tenantId + "] is not found");
+            checkNotNull(tenant, "ID【" + tenantId + "】相关的租户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT, operation, tenantId, tenant);
             return tenant;
         } catch (Exception e) {
@@ -420,9 +420,9 @@ public abstract class BaseController {
     TenantProfile checkTenantProfileId(TenantProfileId tenantProfileId, Operation operation) throws ThingsboardException {
         try {
-            validateId(tenantProfileId, "Incorrect tenantProfileId " + tenantProfileId);
+            validateId(tenantProfileId, "错误的租户配置ID " + tenantProfileId);
             TenantProfile tenantProfile = tenantProfileService.findTenantProfileById(getTenantId(), tenantProfileId);
-            checkNotNull(tenantProfile, "Tenant profile with id [" + tenantProfileId + "] is not found");
+            checkNotNull(tenantProfile, "ID【" + tenantProfileId + "】相关的租户配置不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.TENANT_PROFILE, operation);
             return tenantProfile;
         } catch (Exception e) {
@@ -436,9 +436,9 @@ public abstract class BaseController {
     protected Customer checkCustomerId(CustomerId customerId, Operation operation) throws ThingsboardException {
         try {
-            validateId(customerId, "Incorrect customerId " + customerId);
+            validateId(customerId, "客户ID不正确 " + customerId);
             Customer customer = customerService.findCustomerById(getTenantId(), customerId);
-            checkNotNull(customer, "Customer with id [" + customerId + "] is not found");
+            checkNotNull(customer, "ID【" + customerId + "】相关的客户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.CUSTOMER, operation, customerId, customer);
             return customer;
         } catch (Exception e) {
@@ -448,9 +448,9 @@ public abstract class BaseController {
     protected User checkUserId(UserId userId, Operation operation) throws ThingsboardException {
         try {
-            validateId(userId, "Incorrect userId " + userId);
+            validateId(userId, "用户ID不正确 " + userId);
             User user = userService.findUserById(getCurrentUser().getTenantId(), userId);
-            checkNotNull(user, "User with id [" + userId + "] is not found");
+            checkNotNull(user, "ID【" + userId + "】相关的用户不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.USER, operation, userId, user);
             return user;
         } catch (Exception e) {
@@ -470,9 +470,9 @@ public abstract class BaseController {
     protected void checkEntityId(EntityId entityId, Operation operation) throws ThingsboardException {
         try {
             if (entityId == null) {
-                throw new ThingsboardException("Parameter entityId can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                throw new ThingsboardException("参数entityId不能为空!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
             }
-            validateId(entityId.getId(), "Incorrect entityId " + entityId);
+            validateId(entityId.getId(), "entityId不正确 " + entityId);
             switch (entityId.getEntityType()) {
                 case ALARM:
                     checkAlarmId(new AlarmId(entityId.getId()), operation);
@@ -526,7 +526,7 @@ public abstract class BaseController {
                     checkOtaPackageId(new OtaPackageId(entityId.getId()), operation);
                     return;
                 default:
-                    throw new IllegalArgumentException("Unsupported entity type: " + entityId.getEntityType());
+                    throw new IllegalArgumentException("不支持的资源类型: " + entityId.getEntityType());
             }
         } catch (Exception e) {
             throw handleException(e, false);
@@ -535,9 +535,9 @@ public abstract class BaseController {
     public Device checkDeviceId(DeviceId deviceId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceId, "Incorrect deviceId " + deviceId);
+            validateId(deviceId, "deviceId不正确 " + deviceId);
             Device device = deviceService.findDeviceById(getCurrentUser().getTenantId(), deviceId);
-            checkNotNull(device, "Device with id [" + deviceId + "] is not found");
+            checkNotNull(device, "ID【" + deviceId + "】相关的设备不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE, operation, deviceId, device);
             return device;
         } catch (Exception e) {
@@ -547,9 +547,9 @@ public abstract class BaseController {
     DeviceInfo checkDeviceInfoId(DeviceId deviceId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceId, "Incorrect deviceId " + deviceId);
+            validateId(deviceId, "deviceId不正确" + deviceId);
             DeviceInfo device = deviceService.findDeviceInfoById(getCurrentUser().getTenantId(), deviceId);
-            checkNotNull(device, "Device with id [" + deviceId + "] is not found");
+            checkNotNull(device, "ID【" + deviceId + "】相关的设备不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE, operation, deviceId, device);
             return device;
         } catch (Exception e) {
@@ -559,9 +559,9 @@ public abstract class BaseController {
     protected DeviceProfile checkDeviceProfileId(DeviceProfileId deviceProfileId, Operation operation) throws ThingsboardException {
         try {
-            validateId(deviceProfileId, "Incorrect deviceProfileId " + deviceProfileId);
+            validateId(deviceProfileId, "设备配置Id不正确 " + deviceProfileId);
             DeviceProfile deviceProfile = deviceProfileService.findDeviceProfileById(getCurrentUser().getTenantId(), deviceProfileId);
-            checkNotNull(deviceProfile, "Device profile with id [" + deviceProfileId + "] is not found");
+            checkNotNull(deviceProfile, "ID【" + deviceProfileId + "】相关的设备配置不存在");
             accessControlService.checkPermission(getCurrentUser(), Resource.DEVICE_PROFILE, operation, deviceProfileId, deviceProfile);
             return deviceProfile;
         } catch (Exception e) {
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMenuController.java
View file @3d32d11
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/YtMenuController.java
View file @3d32d11
@@ -84,7 +84,7 @@ public class YtMenuController extends BaseController {
   @PreAuthorize("hasAnyAuthority('SYS_ADMIN','PLATFORM_ADMIN')")
   public void deleteMenus(@RequestBody String[] ids) throws ThingsboardException {
     if (ids.length == 0) {
-      throw new YtDataValidationException("please provide menu ids to delete");
+      throw new YtDataValidationException("需要删除的菜单不能为空");
     }
     menuService.deleteMenus(getCurrentUser().getCurrentTenantId(), ids);
   }
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/aspect/OperateLogAspect.java
View file @3d32d11
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/aspect/OperateLogAspect.java
View file @3d32d11
@@ -150,7 +150,7 @@ public class OperateLogAspect {
         if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
             return (SecurityUser) authentication.getPrincipal();
         } else {
-            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+            throw new ThingsboardException("你没有权限执行该操作!", ThingsboardErrorCode.AUTHENTICATION);
         }
     }
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/RoleServiceImpl.java
View file @3d32d11
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/RoleServiceImpl.java
View file @3d32d11
@@ -71,7 +71,7 @@ public class RoleServiceImpl extends AbstractBaseService<RoleMapper, Role> imple
                 baseMapper.selectCount(
                         new QueryWrapper<Role>().lambda().ne(Role::getTenantId, tenantId).in(Role::getId, ids));
         if (notTenantMenuCount > 0) {
-            throw new AccessDeniedException("cannot delete role that not create by you");
+            throw new AccessDeniedException("只能删除自己创建的角色");
         }
         // 判断该角色下面是否有用户
         Set<String> userIds = baseMapper.checkRoleUserMappingByRoleIds(ids);