add localekeys

lhpqaq · Oct 20, 2024 · a351cf4 · a351cf4
1 parent 37c405a
commit a351cf4
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/...manager-server/src/main/java/org/apache/bigtop/manager/server/enums/ApiExceptionEnum.java b/...manager-server/src/main/java/org/apache/bigtop/manager/server/enums/ApiExceptionEnum.java
@@ -69,6 +69,8 @@ public enum ApiExceptionEnum {
     MODEL_NOT_SUPPORTED(19004, LocaleKeys.MODEL_NOT_SUPPORTED),
     CHAT_THREAD_NOT_FOUND(19005, LocaleKeys.CHAT_THREAD_NOT_FOUND),
     NO_PLATFORM_IN_USE(19006, LocaleKeys.NO_PLATFORM_IN_USE),
+    PLATFORM_NOT_IN_USE(19007, LocaleKeys.PLATFORM_NOT_IN_USE),
+    PLATFORM_IS_ACTIVE(19008, LocaleKeys.PLATFORM_IS_ACTIVE),
     ;
 
     private final Integer code;

diff --git a/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/LocaleKeys.java b/bigtop-manager-server/src/main/java/org/apache/bigtop/manager/server/enums/LocaleKeys.java
@@ -66,6 +66,8 @@ public enum LocaleKeys {
 
     CHAT_LANGUAGE_PROMPT("chat.language.prompt"),
     NO_PLATFORM_IN_USE("no.platform.in.use"),
+    PLATFORM_NOT_IN_USE("platform.not.in.use"),
+    PLATFORM_IS_ACTIVE("platform.is.active"),
     ;
 
     private final String key;

diff --git a/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java b/...erver/src/main/java/org/apache/bigtop/manager/server/service/impl/ChatbotServiceImpl.java
@@ -122,7 +122,7 @@ private AIAssistant buildAIAssistant(
     public ChatThreadVO createChatThreads() {
         AuthPlatformPO authPlatformPO = getActiveAuthPlatform();
         if (authPlatformPO == null || authPlatformPO.getIsDeleted()) {
-            throw new ApiException(ApiExceptionEnum.PLATFORM_NOT_AUTHORIZED);
+            throw new ApiException(ApiExceptionEnum.NO_PLATFORM_IN_USE);
         }
         AuthPlatformDTO authPlatformDTO = AuthPlatformConverter.INSTANCE.fromPO2DTO(authPlatformPO);
         Long userId = SessionUserHolder.getUserId();
@@ -151,10 +151,8 @@ public boolean deleteChatThreads(Long threadId) {
         chatThreadPO.setIsDeleted(true);
         chatThreadDao.partialUpdateById(chatThreadPO);
         List<ChatMessagePO> chatMessagePOS = chatMessageDao.findAllByThreadId(threadId);
-        for (ChatMessagePO chatMessagePO : chatMessagePOS) {
-            chatMessagePO.setIsDeleted(true);
-            chatMessageDao.partialUpdateById(chatMessagePO);
-        }
+        chatMessagePOS.forEach(chatMessagePO -> chatMessagePO.setIsDeleted(true));
+        chatMessageDao.partialUpdateByIds(chatMessagePOS);
 
         return true;
     }
@@ -187,8 +185,10 @@ public SseEmitter talk(Long threadId, String message) {
             throw new ApiException(ApiExceptionEnum.CHAT_THREAD_NOT_FOUND);
         }
         AuthPlatformPO authPlatformPO = getActiveAuthPlatform();
-        if (authPlatformPO == null) {
-            throw new ApiException(ApiExceptionEnum.NO_PLATFORM_IN_USE);
+        if (authPlatformPO == null
+                || authPlatformPO.getIsDeleted()
+                || !authPlatformPO.getId().equals(chatThreadPO.getAuthId())) {
+            throw new ApiException(ApiExceptionEnum.PLATFORM_NOT_IN_USE);
         }
         AuthPlatformDTO authPlatformDTO = AuthPlatformConverter.INSTANCE.fromPO2DTO(authPlatformPO);
         ChatThreadDTO chatThreadDTO = ChatThreadConverter.INSTANCE.fromPO2DTO(chatThreadPO);

diff --git a/...ver/src/main/java/org/apache/bigtop/manager/server/service/impl/LLMConfigServiceImpl.java b/...ver/src/main/java/org/apache/bigtop/manager/server/service/impl/LLMConfigServiceImpl.java
@@ -207,6 +207,10 @@ public boolean deleteAuthorizedPlatform(Long authId) {
             throw new ApiException(ApiExceptionEnum.PLATFORM_NOT_AUTHORIZED);
         }
 
+        if (AuthPlatformStatus.isActive(authPlatformPO.getStatus())) {
+            throw new ApiException(ApiExceptionEnum.PLATFORM_IS_ACTIVE);
+        }
+
         authPlatformPO.setIsDeleted(true);
         authPlatformDao.partialUpdateById(authPlatformPO);
 

diff --git a/bigtop-manager-server/src/main/resources/i18n/messages_en_US.properties b/bigtop-manager-server/src/main/resources/i18n/messages_en_US.properties
@@ -51,10 +51,12 @@ config.not.found=Config not exist
 command.not.found=Command not found for level [{0}]
 command.not.supported=Command [{0}] not supported for level [{1}]
 
-platform.not.found=platform not found
-platform.not.authorized=platform not authorized
-permission.denied=permission denied
-credit.incorrect=credit incorrect
-model.not.supported=model not supported
-chat.thread.not.found=chat thread not found
-no.platform.in.use=no platform currently in use
+platform.not.found=Platform not found
+platform.not.authorized=Platform not authorized
+permission.denied=Permission denied
+credit.incorrect=Credit incorrect
+model.not.supported=Model not supported
+chat.thread.not.found=Chat thread not found
+no.platform.in.use=No platform currently in use
+platform.not.in.use=Corresponding platform not use
+platform.is.active=The platform is active
diff --git a/bigtop-manager-server/src/main/resources/i18n/messages_zh_CN.properties b/bigtop-manager-server/src/main/resources/i18n/messages_zh_CN.properties
@@ -58,3 +58,5 @@ credit.incorrect=凭证不正确
 model.not.supported=模型不支持
 chat.thread.not.found=线程不存在
 no.platform.in.use=没有正在使用的平台
+platform.not.in.use=对应的平台未使用
+platform.is.active=平台正在使用