fix：openapi 添加i18n错误信息

chenjunyu_1481036421
1 parent 7688d9ef
Showing 6 changed files with 27 additions and 7 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/openApi/OpenApiController.java
application/src/main/resources/i18n/messages_en_US.properties
application/src/main/resources/i18n/messages_zh_CN.properties
common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/ApplicationServiceImpl.java
dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/OpenApiImpl.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/openApi/OpenApiController.java
View file @8b8cd51
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/openApi/OpenApiController.java
View file @8b8cd51
@@ -12,10 +12,13 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.thingsboard.server.common.data.StringUtils;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.ApplicationDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiContrlooerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDTO;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.yunteng.TkThirdPlatformController;
 import org.thingsboard.server.controller.yunteng.TkUserController;
@@ -82,7 +85,8 @@ public class OpenApiController extends BaseController {
       //记录日志
       setRecord(api,appDto,record);
       if (!appDto.getApiList().contains(api.getId())) {
-        throw new RuntimeException("没有权限");
+        throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+                NOT_HAVE_PERMISSION.getI18nCode())));
       }
       // 构建URL
       String url = MiscUtils.constructBaseUrl(request) + api.getUri();
--- a/application/src/main/resources/i18n/messages_en_US.properties
View file @8b8cd51
+++ b/application/src/main/resources/i18n/messages_en_US.properties
View file @8b8cd51
@@ -191,6 +191,8 @@ rule.chain.used.by.device.profile = This rule chain is being used by the [% s] p
 same.type.node.name.already.exists = Node names of the same type have already been used.
 choice.device.profile.rule.chain.is.used.for.convert = The selected product [% s] is currently being used by the data flow [% s] and cannot change the rule chain!!
 choice.device.profile.rule.chain.is.used.for.scene = The selected product [% s] is currently being used by the scene linkage [% s] and cannot change the rule chain!!
+openapi.app.isnull= The application does not exist
+openapi.api.isnull= API does not exist
--- a/application/src/main/resources/i18n/messages_zh_CN.properties
View file @8b8cd51
+++ b/application/src/main/resources/i18n/messages_zh_CN.properties
View file @8b8cd51
@@ -190,4 +190,6 @@ scene.react.is.edge = 场景联动来自于边端请勿操作
 rule.chain.used.by.device.profile = 该规则链正在被【%s】产品使用,不能被删除！！
 same.type.node.name.already.exists = 同类型的节点名称已被使用
 choice.device.profile.rule.chain.is.used.for.convert = 选中的产品【%s】正在被数据流转【%s】使用，不能更换规则链！！
-choice.device.profile.rule.chain.is.used.for.scene = 选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！
+choice.device.profile.rule.chain.is.used.for.scene = 选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！
+openapi.app.isnull= 应用不存在
+openapi.api.isnull= api不存在
--- a/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @8b8cd51
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/yunteng/core/message/ErrorMessage.java
View file @8b8cd51
@@ -194,6 +194,8 @@ public enum ErrorMessage {
   SAME_TYPE_NODE_NAME_ALREADY_EXISTS(400159,"同类型的节点名称已被使用","same.type.node.name.already.exists"),
   CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_CONVERT(400160,"选中的产品【%s】正在被数据流转【%s】使用，不能更换规则链！！","choice.device.profile.rule.chain.is.used.for.convert"),
   CHOICE_DEVICE_PROFILE_RULE_CHAIN_IS_USED_FOR_SCENE(400161,"选中的产品【%s】正在被场景联动【%s】使用，不能更换规则链！！","choice.device.profile.rule.chain.is.used.for.scene"),
+  OPENAPI_APP_ISNULL(400162,"应用不存在","openapi.app.isnull"),
+  OPENAPI_API_ISNULL(400163,"api不存在","openapi.api.isnull"),
   HAVE_NO_PERMISSION(500002, "没有修改权限", "have.no.permission"),
   NOT_ALLOWED_ISOLATED_IN_MONOLITH(500003, "【monolith】模式下，不能选择【isolated】类型的租户配置", "not.allowed.isolated.in.monolith"),
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/ApplicationServiceImpl.java
View file @8b8cd51
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/ApplicationServiceImpl.java
View file @8b8cd51
@@ -7,7 +7,10 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.ApplicationDTO;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkApplicationApiEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkApplicationEntity;
@@ -118,7 +121,8 @@ public class ApplicationServiceImpl extends AbstractBaseService<ApplicationMappe
                     .eq(TkApplicationEntity::getKey, key)
                     .eq(TkApplicationEntity::getSecret,secret));
     if(null == entity){
-        throw  new RuntimeException("应用不存在");
+      throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+              OPENAPI_APP_ISNULL.getI18nCode())));
     }
     ApplicationDTO dto  = new ApplicationDTO();
     entity.copyToDTO(dto);
@@ -131,7 +135,8 @@ public class ApplicationServiceImpl extends AbstractBaseService<ApplicationMappe
             new LambdaQueryWrapper<TkApplicationEntity>()
                     .eq(TkApplicationEntity::getUserId, userId));
     if(null == entity){
-      throw  new RuntimeException("应用不存在");
+      throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+              OPENAPI_APP_ISNULL.getI18nCode())));
     }
     ApplicationDTO dto = new ApplicationDTO();
     entity.copyToDTO(dto);
--- a/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/OpenApiImpl.java
View file @8b8cd51
+++ b/dao/src/main/java/org/thingsboard/server/dao/yunteng/impl/OpenApiImpl.java
View file @8b8cd51
@@ -8,11 +8,13 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiContrlooerDTO;
 import org.thingsboard.server.common.data.yunteng.dto.OpenApiDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ApiMenuDTO;
 import org.thingsboard.server.common.data.yunteng.utils.CopyUtils;
+import org.thingsboard.server.common.data.yunteng.utils.i18n.MessageUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.dao.yunteng.entities.TkOpenApiEntity;
 import org.thingsboard.server.dao.yunteng.mapper.OpenApiMapper;
@@ -33,7 +35,8 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
   public OpenApiDTO getDto(String id) {
     TkOpenApiEntity entity  = baseMapper.selectById(id);
     if(null == entity){
-      throw  new RuntimeException("Api不存在");
+      throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+              OPENAPI_API_ISNULL.getI18nCode())));
     }
     OpenApiDTO dto = new OpenApiDTO();
     entity.copyToDTO(dto);
@@ -79,7 +82,8 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
             .in(TkOpenApiEntity::getId,apiIds));
     list.stream().forEach(entity ->{
       if(!entity.getTenantId().equals(tenantId)){
-        throw new TkDataValidationException("没有权限删除");
+        throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+                NOT_HAVE_PERMISSION.getI18nCode())));
       }
     });
     return baseMapper.deleteBatchIds(apiIds) > 0;
@@ -90,7 +94,8 @@ public class OpenApiImpl extends AbstractBaseService<OpenApiMapper, TkOpenApiEnt
   public OpenApiDTO update(OpenApiDTO dto, String tenantId) {
     TkOpenApiEntity openApi = baseMapper.selectById(dto.getId());
     if(!openApi.getTenantId().equals(tenantId)){
-      throw new TkDataValidationException("没有权限删除");
+      throw new TkDataValidationException(String.format(MessageUtils.message(ErrorMessage.
+              NOT_HAVE_PERMISSION.getI18nCode())));
     }
     dto.copyToEntity(openApi);
     baseMapper.updateById(openApi);