Commit 71e3240af6d8f2f29f1b847d0853881c81e108d0
1 parent
5cec6d52
【优化】代码优化,统一增加ai前缀
Showing
38 changed files
with
166 additions
and
176 deletions
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/ChatConversationTypeEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiChatConversationTypeEnum.java
| @@ -13,7 +13,7 @@ import lombok.Getter; | @@ -13,7 +13,7 @@ import lombok.Getter; | ||
| 13 | */ | 13 | */ |
| 14 | @AllArgsConstructor | 14 | @AllArgsConstructor |
| 15 | @Getter | 15 | @Getter |
| 16 | -public enum ChatConversationTypeEnum { | 16 | +public enum AiChatConversationTypeEnum { |
| 17 | 17 | ||
| 18 | // roleChat、userChat | 18 | // roleChat、userChat |
| 19 | ROLE_CHAT("roleChat", "角色对话"), | 19 | ROLE_CHAT("roleChat", "角色对话"), |
| @@ -25,8 +25,8 @@ public enum ChatConversationTypeEnum { | @@ -25,8 +25,8 @@ public enum ChatConversationTypeEnum { | ||
| 25 | 25 | ||
| 26 | private String name; | 26 | private String name; |
| 27 | 27 | ||
| 28 | - public static ChatConversationTypeEnum valueOfType(String type) { | ||
| 29 | - for (ChatConversationTypeEnum itemEnum : ChatConversationTypeEnum.values()) { | 28 | + public static AiChatConversationTypeEnum valueOfType(String type) { |
| 29 | + for (AiChatConversationTypeEnum itemEnum : AiChatConversationTypeEnum.values()) { | ||
| 30 | if (itemEnum.getType().equals(type)) { | 30 | if (itemEnum.getType().equals(type)) { |
| 31 | return itemEnum; | 31 | return itemEnum; |
| 32 | } | 32 | } |
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/ChatRoleClassifyEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiChatRoleClassifyEnum.java
| @@ -12,7 +12,7 @@ import lombok.Getter; | @@ -12,7 +12,7 @@ import lombok.Getter; | ||
| 12 | */ | 12 | */ |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
| 14 | @Getter | 14 | @Getter |
| 15 | -public enum ChatRoleClassifyEnum { | 15 | +public enum AiChatRoleClassifyEnum { |
| 16 | 16 | ||
| 17 | WRITING("writing", "写作"), | 17 | WRITING("writing", "写作"), |
| 18 | 18 | ||
| @@ -26,8 +26,8 @@ public enum ChatRoleClassifyEnum { | @@ -26,8 +26,8 @@ public enum ChatRoleClassifyEnum { | ||
| 26 | private String name; | 26 | private String name; |
| 27 | 27 | ||
| 28 | 28 | ||
| 29 | - public static ChatRoleClassifyEnum valueOfClassify(String classify) { | ||
| 30 | - for (ChatRoleClassifyEnum itemEnum : ChatRoleClassifyEnum.values()) { | 29 | + public static AiChatRoleClassifyEnum valueOfClassify(String classify) { |
| 30 | + for (AiChatRoleClassifyEnum itemEnum : AiChatRoleClassifyEnum.values()) { | ||
| 31 | if (itemEnum.getClassify().equals(classify)) { | 31 | if (itemEnum.getClassify().equals(classify)) { |
| 32 | return itemEnum; | 32 | return itemEnum; |
| 33 | } | 33 | } |
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/ChatRoleSourceEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiChatRoleSourceEnum.java
| @@ -12,7 +12,7 @@ import lombok.Getter; | @@ -12,7 +12,7 @@ import lombok.Getter; | ||
| 12 | */ | 12 | */ |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
| 14 | @Getter | 14 | @Getter |
| 15 | -public enum ChatRoleSourceEnum { | 15 | +public enum AiChatRoleSourceEnum { |
| 16 | 16 | ||
| 17 | SYSTEM("system", "系统"), | 17 | SYSTEM("system", "系统"), |
| 18 | CUSTOMER("customer", "用户自定义"), | 18 | CUSTOMER("customer", "用户自定义"), |
| @@ -25,8 +25,8 @@ public enum ChatRoleSourceEnum { | @@ -25,8 +25,8 @@ public enum ChatRoleSourceEnum { | ||
| 25 | private String name; | 25 | private String name; |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | - public static ChatRoleSourceEnum valueOfType(String type) { | ||
| 29 | - for (ChatRoleSourceEnum itemEnum : ChatRoleSourceEnum.values()) { | 28 | + public static AiChatRoleSourceEnum valueOfType(String type) { |
| 29 | + for (AiChatRoleSourceEnum itemEnum : AiChatRoleSourceEnum.values()) { | ||
| 30 | if (itemEnum.getType().equals(type)) { | 30 | if (itemEnum.getType().equals(type)) { |
| 31 | return itemEnum; | 31 | return itemEnum; |
| 32 | } | 32 | } |
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/ChatRoleVisibilityEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiChatRoleVisibilityEnum.java
| @@ -12,7 +12,7 @@ import lombok.Getter; | @@ -12,7 +12,7 @@ import lombok.Getter; | ||
| 12 | */ | 12 | */ |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
| 14 | @Getter | 14 | @Getter |
| 15 | -public enum ChatRoleVisibilityEnum { | 15 | +public enum AiChatRoleVisibilityEnum { |
| 16 | 16 | ||
| 17 | PUBLIC("public", "公开"), | 17 | PUBLIC("public", "公开"), |
| 18 | PRIVATE("private", "私有的"), | 18 | PRIVATE("private", "私有的"), |
| @@ -24,8 +24,8 @@ public enum ChatRoleVisibilityEnum { | @@ -24,8 +24,8 @@ public enum ChatRoleVisibilityEnum { | ||
| 24 | private String name; | 24 | private String name; |
| 25 | 25 | ||
| 26 | 26 | ||
| 27 | - public static ChatRoleVisibilityEnum valueOfType(String type) { | ||
| 28 | - for (ChatRoleVisibilityEnum itemEnum : ChatRoleVisibilityEnum.values()) { | 27 | + public static AiChatRoleVisibilityEnum valueOfType(String type) { |
| 28 | + for (AiChatRoleVisibilityEnum itemEnum : AiChatRoleVisibilityEnum.values()) { | ||
| 29 | if (itemEnum.getType().equals(type)) { | 29 | if (itemEnum.getType().equals(type)) { |
| 30 | return itemEnum; | 30 | return itemEnum; |
| 31 | } | 31 | } |
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/ChatTypeEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiChatTypeEnum.java
| @@ -12,7 +12,7 @@ import lombok.Getter; | @@ -12,7 +12,7 @@ import lombok.Getter; | ||
| 12 | */ | 12 | */ |
| 13 | @AllArgsConstructor | 13 | @AllArgsConstructor |
| 14 | @Getter | 14 | @Getter |
| 15 | -public enum ChatTypeEnum { | 15 | +public enum AiChatTypeEnum { |
| 16 | 16 | ||
| 17 | ROLE_CHAT("roleChat", "角色模板聊天"), | 17 | ROLE_CHAT("roleChat", "角色模板聊天"), |
| 18 | USER_CHAT("userChat", "用户普通聊天"), | 18 | USER_CHAT("userChat", "用户普通聊天"), |
| @@ -23,8 +23,8 @@ public enum ChatTypeEnum { | @@ -23,8 +23,8 @@ public enum ChatTypeEnum { | ||
| 23 | 23 | ||
| 24 | private String name; | 24 | private String name; |
| 25 | 25 | ||
| 26 | - public static ChatTypeEnum valueOfType(String type) { | ||
| 27 | - for (ChatTypeEnum itemEnum : ChatTypeEnum.values()) { | 26 | + public static AiChatTypeEnum valueOfType(String type) { |
| 27 | + for (AiChatTypeEnum itemEnum : AiChatTypeEnum.values()) { | ||
| 28 | if (itemEnum.getType().equals(type)) { | 28 | if (itemEnum.getType().equals(type)) { |
| 29 | return itemEnum; | 29 | return itemEnum; |
| 30 | } | 30 | } |
yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/OpenAiModelEnum.java renamed to yudao-module-ai/yudao-module-ai-api/src/main/java/cn/iocoder/yudao/module/ai/enums/AiOpenAiModelEnum.java
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatController.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/AiChatController.java
| 1 | package cn.iocoder.yudao.module.ai.controller; | 1 | package cn.iocoder.yudao.module.ai.controller; |
| 2 | 2 | ||
| 3 | -import cn.hutool.core.exceptions.ExceptionUtil; | ||
| 4 | -import cn.iocoder.yudao.framework.ai.chat.ChatResponse; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 6 | -import cn.iocoder.yudao.module.ai.service.ChatService; | ||
| 7 | -import cn.iocoder.yudao.module.ai.vo.ChatReq; | 4 | +import cn.iocoder.yudao.module.ai.service.AiChatService; |
| 5 | +import cn.iocoder.yudao.module.ai.vo.AiChatReq; | ||
| 8 | import io.swagger.v3.oas.annotations.Operation; | 6 | import io.swagger.v3.oas.annotations.Operation; |
| 9 | import io.swagger.v3.oas.annotations.tags.Tag; | 7 | import io.swagger.v3.oas.annotations.tags.Tag; |
| 10 | import lombok.AllArgsConstructor; | 8 | import lombok.AllArgsConstructor; |
| @@ -17,10 +15,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; | @@ -17,10 +15,6 @@ import org.springframework.web.bind.annotation.ModelAttribute; | ||
| 17 | import org.springframework.web.bind.annotation.RequestMapping; | 15 | import org.springframework.web.bind.annotation.RequestMapping; |
| 18 | import org.springframework.web.bind.annotation.RestController; | 16 | import org.springframework.web.bind.annotation.RestController; |
| 19 | import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; | 17 | import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; |
| 20 | -import reactor.core.publisher.Flux; | ||
| 21 | - | ||
| 22 | -import java.io.IOException; | ||
| 23 | -import java.util.function.Consumer; | ||
| 24 | 18 | ||
| 25 | /** | 19 | /** |
| 26 | * ia 模块 | 20 | * ia 模块 |
| @@ -34,21 +28,21 @@ import java.util.function.Consumer; | @@ -34,21 +28,21 @@ import java.util.function.Consumer; | ||
| 34 | @RequestMapping("/ai") | 28 | @RequestMapping("/ai") |
| 35 | @Slf4j | 29 | @Slf4j |
| 36 | @AllArgsConstructor | 30 | @AllArgsConstructor |
| 37 | -public class ChatController { | 31 | +public class AiChatController { |
| 38 | 32 | ||
| 39 | @Autowired | 33 | @Autowired |
| 40 | - private final ChatService chatService; | 34 | + private final AiChatService chatService; |
| 41 | 35 | ||
| 42 | @Operation(summary = "聊天-chat", description = "这个一般等待时间比较久,需要全部完成才会返回!") | 36 | @Operation(summary = "聊天-chat", description = "这个一般等待时间比较久,需要全部完成才会返回!") |
| 43 | @GetMapping("/chat") | 37 | @GetMapping("/chat") |
| 44 | - public CommonResult<String> chat(@Validated @ModelAttribute ChatReq req) { | 38 | + public CommonResult<String> chat(@Validated @ModelAttribute AiChatReq req) { |
| 45 | return CommonResult.success(chatService.chat(req)); | 39 | return CommonResult.success(chatService.chat(req)); |
| 46 | } | 40 | } |
| 47 | 41 | ||
| 48 | // TODO @芋艿:调用这个方法异常,Unable to handle the Spring Security Exception because the response is already committed. | 42 | // TODO @芋艿:调用这个方法异常,Unable to handle the Spring Security Exception because the response is already committed. |
| 49 | @Operation(summary = "聊天-stream", description = "这里跟通义千问一样采用的是 Server-Sent Events (SSE) 通讯模式") | 43 | @Operation(summary = "聊天-stream", description = "这里跟通义千问一样采用的是 Server-Sent Events (SSE) 通讯模式") |
| 50 | @GetMapping(value = "/chatStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) | 44 | @GetMapping(value = "/chatStream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) |
| 51 | - public SseEmitter chatStream(@Validated @ModelAttribute ChatReq req) { | 45 | + public SseEmitter chatStream(@Validated @ModelAttribute AiChatReq req) { |
| 52 | Utf8SseEmitter sseEmitter = new Utf8SseEmitter(); | 46 | Utf8SseEmitter sseEmitter = new Utf8SseEmitter(); |
| 53 | chatService.chatStream(req, sseEmitter); | 47 | chatService.chatStream(req, sseEmitter); |
| 54 | return sseEmitter; | 48 | return sseEmitter; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatConversationController.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/AiChatConversationController.java
| 1 | package cn.iocoder.yudao.module.ai.controller; | 1 | package cn.iocoder.yudao.module.ai.controller; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | -import cn.iocoder.yudao.module.ai.service.ChatConversationService; | ||
| 5 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateRoleReq; | ||
| 6 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateUserReq; | ||
| 7 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationListReq; | ||
| 8 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationRes; | 4 | +import cn.iocoder.yudao.module.ai.service.AiChatConversationService; |
| 5 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateRoleReq; | ||
| 6 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateUserReq; | ||
| 7 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationListReq; | ||
| 8 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationRes; | ||
| 9 | import io.swagger.v3.oas.annotations.Operation; | 9 | import io.swagger.v3.oas.annotations.Operation; |
| 10 | import io.swagger.v3.oas.annotations.tags.Tag; | 10 | import io.swagger.v3.oas.annotations.tags.Tag; |
| 11 | import lombok.AllArgsConstructor; | 11 | import lombok.AllArgsConstructor; |
| @@ -27,31 +27,31 @@ import java.util.List; | @@ -27,31 +27,31 @@ import java.util.List; | ||
| 27 | @RequestMapping("/ai/chat/conversation") | 27 | @RequestMapping("/ai/chat/conversation") |
| 28 | @Slf4j | 28 | @Slf4j |
| 29 | @AllArgsConstructor | 29 | @AllArgsConstructor |
| 30 | -public class ChatConversationController { | 30 | +public class AiChatConversationController { |
| 31 | 31 | ||
| 32 | - private final ChatConversationService chatConversationService; | 32 | + private final AiChatConversationService chatConversationService; |
| 33 | 33 | ||
| 34 | @Operation(summary = "创建 - 对话普通对话") | 34 | @Operation(summary = "创建 - 对话普通对话") |
| 35 | @PostMapping("/createConversation") | 35 | @PostMapping("/createConversation") |
| 36 | - public CommonResult<ChatConversationRes> createConversation(@RequestBody @Validated ChatConversationCreateUserReq req) { | 36 | + public CommonResult<AiChatConversationRes> createConversation(@RequestBody @Validated AiChatConversationCreateUserReq req) { |
| 37 | return CommonResult.success(chatConversationService.createConversation(req)); | 37 | return CommonResult.success(chatConversationService.createConversation(req)); |
| 38 | } | 38 | } |
| 39 | 39 | ||
| 40 | @Operation(summary = "创建 - 对话角色对话") | 40 | @Operation(summary = "创建 - 对话角色对话") |
| 41 | @PostMapping("/createRoleConversation") | 41 | @PostMapping("/createRoleConversation") |
| 42 | - public CommonResult<ChatConversationRes> createRoleConversation(@RequestBody @Validated ChatConversationCreateRoleReq req) { | 42 | + public CommonResult<AiChatConversationRes> createRoleConversation(@RequestBody @Validated AiChatConversationCreateRoleReq req) { |
| 43 | return CommonResult.success(chatConversationService.createRoleConversation(req)); | 43 | return CommonResult.success(chatConversationService.createRoleConversation(req)); |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | @Operation(summary = "获取 - 获取对话") | 46 | @Operation(summary = "获取 - 获取对话") |
| 47 | @GetMapping("/{id}") | 47 | @GetMapping("/{id}") |
| 48 | - public CommonResult<ChatConversationRes> getConversation(@PathVariable("id") Long id) { | 48 | + public CommonResult<AiChatConversationRes> getConversation(@PathVariable("id") Long id) { |
| 49 | return CommonResult.success(chatConversationService.getConversation(id)); | 49 | return CommonResult.success(chatConversationService.getConversation(id)); |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | @Operation(summary = "获取 - 获取对话list") | 52 | @Operation(summary = "获取 - 获取对话list") |
| 53 | @GetMapping("/list") | 53 | @GetMapping("/list") |
| 54 | - public CommonResult<List<ChatConversationRes>> listConversation(@ModelAttribute @Validated ChatConversationListReq req) { | 54 | + public CommonResult<List<AiChatConversationRes>> listConversation(@ModelAttribute @Validated AiChatConversationListReq req) { |
| 55 | return CommonResult.success(chatConversationService.listConversation(req)); | 55 | return CommonResult.success(chatConversationService.listConversation(req)); |
| 56 | } | 56 | } |
| 57 | 57 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatMessageController.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/AiChatMessageController.java
| @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.ai.controller; | @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.ai.controller; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.yudao.module.ai.service.ChatMessageService; | ||
| 6 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageListRes; | ||
| 7 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | 5 | +import cn.iocoder.yudao.module.ai.service.AiChatMessageService; |
| 6 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageListRes; | ||
| 7 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageReq; | ||
| 8 | import io.swagger.v3.oas.annotations.Operation; | 8 | import io.swagger.v3.oas.annotations.Operation; |
| 9 | import io.swagger.v3.oas.annotations.tags.Tag; | 9 | import io.swagger.v3.oas.annotations.tags.Tag; |
| 10 | import lombok.AllArgsConstructor; | 10 | import lombok.AllArgsConstructor; |
| @@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.*; | @@ -24,13 +24,13 @@ import org.springframework.web.bind.annotation.*; | ||
| 24 | @RequestMapping("/ai/chat/message") | 24 | @RequestMapping("/ai/chat/message") |
| 25 | @Slf4j | 25 | @Slf4j |
| 26 | @AllArgsConstructor | 26 | @AllArgsConstructor |
| 27 | -public class ChatMessageController { | 27 | +public class AiChatMessageController { |
| 28 | 28 | ||
| 29 | - private final ChatMessageService chatMessageService; | 29 | + private final AiChatMessageService chatMessageService; |
| 30 | 30 | ||
| 31 | @Operation(summary = "聊天记录", description = "查询个人的聊天记录") | 31 | @Operation(summary = "聊天记录", description = "查询个人的聊天记录") |
| 32 | @GetMapping("/list") | 32 | @GetMapping("/list") |
| 33 | - public PageResult<ChatMessageListRes> list(@Validated @ModelAttribute ChatMessageReq req) { | 33 | + public PageResult<AiChatMessageListRes> list(@Validated @ModelAttribute AiChatMessageReq req) { |
| 34 | return chatMessageService.list(req); | 34 | return chatMessageService.list(req); |
| 35 | } | 35 | } |
| 36 | 36 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatRoleController.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/AiChatRoleController.java
| @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller; | @@ -2,7 +2,7 @@ package cn.iocoder.yudao.module.ai.controller; | ||
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.CommonResult; |
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | -import cn.iocoder.yudao.module.ai.service.ChatRoleService; | 5 | +import cn.iocoder.yudao.module.ai.service.AiChatRoleService; |
| 6 | import cn.iocoder.yudao.module.ai.vo.*; | 6 | import cn.iocoder.yudao.module.ai.vo.*; |
| 7 | import io.swagger.v3.oas.annotations.Operation; | 7 | import io.swagger.v3.oas.annotations.Operation; |
| 8 | import io.swagger.v3.oas.annotations.tags.Tag; | 8 | import io.swagger.v3.oas.annotations.tags.Tag; |
| @@ -22,19 +22,19 @@ import org.springframework.web.bind.annotation.*; | @@ -22,19 +22,19 @@ import org.springframework.web.bind.annotation.*; | ||
| 22 | @RequestMapping("/ai/chat") | 22 | @RequestMapping("/ai/chat") |
| 23 | @Slf4j | 23 | @Slf4j |
| 24 | @AllArgsConstructor | 24 | @AllArgsConstructor |
| 25 | -public class ChatRoleController { | 25 | +public class AiChatRoleController { |
| 26 | 26 | ||
| 27 | - private final ChatRoleService chatRoleService; | 27 | + private final AiChatRoleService chatRoleService; |
| 28 | 28 | ||
| 29 | @Operation(summary = "chat角色 - 角色列表") | 29 | @Operation(summary = "chat角色 - 角色列表") |
| 30 | @GetMapping("/role/list") | 30 | @GetMapping("/role/list") |
| 31 | - public PageResult<ChatRoleListRes> list(@Validated @ModelAttribute ChatRoleListReq req) { | 31 | + public PageResult<AiChatRoleListRes> list(@Validated @ModelAttribute AiChatRoleListReq req) { |
| 32 | return chatRoleService.list(req); | 32 | return chatRoleService.list(req); |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | @Operation(summary = "chat角色 - 添加") | 35 | @Operation(summary = "chat角色 - 添加") |
| 36 | @PutMapping("/role") | 36 | @PutMapping("/role") |
| 37 | - public CommonResult<Void> add(@Validated @RequestBody ChatRoleAddReq req) { | 37 | + public CommonResult<Void> add(@Validated @RequestBody AiChatRoleAddReq req) { |
| 38 | chatRoleService.add(req); | 38 | chatRoleService.add(req); |
| 39 | return CommonResult.success(null); | 39 | return CommonResult.success(null); |
| 40 | } | 40 | } |
| @@ -42,7 +42,7 @@ public class ChatRoleController { | @@ -42,7 +42,7 @@ public class ChatRoleController { | ||
| 42 | @Operation(summary = "chat角色 - 修改") | 42 | @Operation(summary = "chat角色 - 修改") |
| 43 | @PostMapping("/role/{id}") | 43 | @PostMapping("/role/{id}") |
| 44 | public CommonResult<Void> update(@PathVariable("id") Long id, | 44 | public CommonResult<Void> update(@PathVariable("id") Long id, |
| 45 | - @Validated @RequestBody ChatRoleUpdateReq req) { | 45 | + @Validated @RequestBody AiChatRoleUpdateReq req) { |
| 46 | chatRoleService.update(id, req); | 46 | chatRoleService.update(id, req); |
| 47 | return CommonResult.success(null); | 47 | return CommonResult.success(null); |
| 48 | } | 48 | } |
| @@ -50,7 +50,7 @@ public class ChatRoleController { | @@ -50,7 +50,7 @@ public class ChatRoleController { | ||
| 50 | @Operation(summary = "chat角色 - 修改可见性") | 50 | @Operation(summary = "chat角色 - 修改可见性") |
| 51 | @PostMapping("/role/{id}/update-visibility") | 51 | @PostMapping("/role/{id}/update-visibility") |
| 52 | public CommonResult<Void> updateVisibility(@PathVariable("id") Long id, | 52 | public CommonResult<Void> updateVisibility(@PathVariable("id") Long id, |
| 53 | - @Validated @RequestBody ChatRoleUpdateVisibilityReq req) { | 53 | + @Validated @RequestBody AiChatRoleUpdateVisibilityReq req) { |
| 54 | chatRoleService.updateVisibility(id, req); | 54 | chatRoleService.updateVisibility(id, req); |
| 55 | return CommonResult.success(null); | 55 | return CommonResult.success(null); |
| 56 | } | 56 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/ChatConversationConvert.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatConversationConvert.java
| 1 | package cn.iocoder.yudao.module.ai.convert; | 1 | package cn.iocoder.yudao.module.ai.convert; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; | 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; |
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationRes; | 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationRes; |
| 5 | import org.mapstruct.Mapper; | 5 | import org.mapstruct.Mapper; |
| 6 | import org.mapstruct.factory.Mappers; | 6 | import org.mapstruct.factory.Mappers; |
| 7 | 7 | ||
| @@ -15,9 +15,9 @@ import java.util.List; | @@ -15,9 +15,9 @@ import java.util.List; | ||
| 15 | * @since 1.0 | 15 | * @since 1.0 |
| 16 | */ | 16 | */ |
| 17 | @Mapper | 17 | @Mapper |
| 18 | -public interface ChatConversationConvert { | 18 | +public interface AiChatConversationConvert { |
| 19 | 19 | ||
| 20 | - ChatConversationConvert INSTANCE = Mappers.getMapper(ChatConversationConvert.class); | 20 | + AiChatConversationConvert INSTANCE = Mappers.getMapper(AiChatConversationConvert.class); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 转换 - 多个 ChatConversationRes | 23 | * 转换 - 多个 ChatConversationRes |
| @@ -25,7 +25,7 @@ public interface ChatConversationConvert { | @@ -25,7 +25,7 @@ public interface ChatConversationConvert { | ||
| 25 | * @param top100Conversation | 25 | * @param top100Conversation |
| 26 | * @return | 26 | * @return |
| 27 | */ | 27 | */ |
| 28 | - List<ChatConversationRes> covnertChatConversationResList(List<AiChatConversationDO> top100Conversation); | 28 | + List<AiChatConversationRes> covnertChatConversationResList(List<AiChatConversationDO> top100Conversation); |
| 29 | 29 | ||
| 30 | /** | 30 | /** |
| 31 | * 转换 - 单个 ChatConversationRes | 31 | * 转换 - 单个 ChatConversationRes |
| @@ -33,5 +33,5 @@ public interface ChatConversationConvert { | @@ -33,5 +33,5 @@ public interface ChatConversationConvert { | ||
| 33 | * @param aiChatConversationDO | 33 | * @param aiChatConversationDO |
| 34 | * @return | 34 | * @return |
| 35 | */ | 35 | */ |
| 36 | - ChatConversationRes covnertChatConversationRes(AiChatConversationDO aiChatConversationDO); | 36 | + AiChatConversationRes covnertChatConversationRes(AiChatConversationDO aiChatConversationDO); |
| 37 | } | 37 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/ChatMessageConvert.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatMessageConvert.java
| 1 | package cn.iocoder.yudao.module.ai.convert; | 1 | package cn.iocoder.yudao.module.ai.convert; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; | 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; |
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageListRes; | 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageListRes; |
| 5 | import org.mapstruct.Mapper; | 5 | import org.mapstruct.Mapper; |
| 6 | import org.mapstruct.factory.Mappers; | 6 | import org.mapstruct.factory.Mappers; |
| 7 | 7 | ||
| @@ -15,9 +15,9 @@ import java.util.List; | @@ -15,9 +15,9 @@ import java.util.List; | ||
| 15 | * @since 1.0 | 15 | * @since 1.0 |
| 16 | */ | 16 | */ |
| 17 | @Mapper | 17 | @Mapper |
| 18 | -public interface ChatMessageConvert { | 18 | +public interface AiChatMessageConvert { |
| 19 | 19 | ||
| 20 | - ChatMessageConvert INSTANCE = Mappers.getMapper(ChatMessageConvert.class); | 20 | + AiChatMessageConvert INSTANCE = Mappers.getMapper(AiChatMessageConvert.class); |
| 21 | 21 | ||
| 22 | /** | 22 | /** |
| 23 | * 转换 ChatMessageListRes | 23 | * 转换 ChatMessageListRes |
| @@ -25,5 +25,5 @@ public interface ChatMessageConvert { | @@ -25,5 +25,5 @@ public interface ChatMessageConvert { | ||
| 25 | * @param list | 25 | * @param list |
| 26 | * @return | 26 | * @return |
| 27 | */ | 27 | */ |
| 28 | - List<ChatMessageListRes> convert(List<AiChatMessageDO> list); | 28 | + List<AiChatMessageListRes> convert(List<AiChatMessageDO> list); |
| 29 | } | 29 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/ChatModalConvert.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatModalConvert.java
| @@ -16,9 +16,9 @@ import java.util.List; | @@ -16,9 +16,9 @@ import java.util.List; | ||
| 16 | * @since 1.0 | 16 | * @since 1.0 |
| 17 | */ | 17 | */ |
| 18 | @Mapper | 18 | @Mapper |
| 19 | -public interface ChatModalConvert { | 19 | +public interface AiChatModalConvert { |
| 20 | 20 | ||
| 21 | - ChatModalConvert INSTANCE = Mappers.getMapper(ChatModalConvert.class); | 21 | + AiChatModalConvert INSTANCE = Mappers.getMapper(AiChatModalConvert.class); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * 转换 - AiChatModalListRes | 24 | * 转换 - AiChatModalListRes |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/ChatRoleConvert.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatRoleConvert.java
| 1 | package cn.iocoder.yudao.module.ai.convert; | 1 | package cn.iocoder.yudao.module.ai.convert; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; | 3 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; |
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatRoleAddReq; | ||
| 5 | -import cn.iocoder.yudao.module.ai.vo.ChatRoleListRes; | ||
| 6 | -import cn.iocoder.yudao.module.ai.vo.ChatRoleUpdateReq; | 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatRoleAddReq; |
| 5 | +import cn.iocoder.yudao.module.ai.vo.AiChatRoleUpdateReq; | ||
| 6 | +import cn.iocoder.yudao.module.ai.vo.AiChatRoleListRes; | ||
| 7 | import org.mapstruct.Mapper; | 7 | import org.mapstruct.Mapper; |
| 8 | import org.mapstruct.factory.Mappers; | 8 | import org.mapstruct.factory.Mappers; |
| 9 | 9 | ||
| @@ -17,9 +17,9 @@ import java.util.List; | @@ -17,9 +17,9 @@ import java.util.List; | ||
| 17 | * @since 1.0 | 17 | * @since 1.0 |
| 18 | */ | 18 | */ |
| 19 | @Mapper | 19 | @Mapper |
| 20 | -public interface ChatRoleConvert { | 20 | +public interface AiChatRoleConvert { |
| 21 | 21 | ||
| 22 | - ChatRoleConvert INSTANCE = Mappers.getMapper(ChatRoleConvert.class); | 22 | + AiChatRoleConvert INSTANCE = Mappers.getMapper(AiChatRoleConvert.class); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * 转换 - ChatRoleListRes | 25 | * 转换 - ChatRoleListRes |
| @@ -27,7 +27,7 @@ public interface ChatRoleConvert { | @@ -27,7 +27,7 @@ public interface ChatRoleConvert { | ||
| 27 | * @param roleList | 27 | * @param roleList |
| 28 | * @return | 28 | * @return |
| 29 | */ | 29 | */ |
| 30 | - List<ChatRoleListRes> convertChatRoleListRes(List<AiChatRoleDO> roleList); | 30 | + List<AiChatRoleListRes> convertChatRoleListRes(List<AiChatRoleDO> roleList); |
| 31 | 31 | ||
| 32 | /** | 32 | /** |
| 33 | * 转换 - AiChatRoleDO | 33 | * 转换 - AiChatRoleDO |
| @@ -35,7 +35,7 @@ public interface ChatRoleConvert { | @@ -35,7 +35,7 @@ public interface ChatRoleConvert { | ||
| 35 | * @param req | 35 | * @param req |
| 36 | * @return | 36 | * @return |
| 37 | */ | 37 | */ |
| 38 | - AiChatRoleDO convertAiChatRoleDO(ChatRoleAddReq req); | 38 | + AiChatRoleDO convertAiChatRoleDO(AiChatRoleAddReq req); |
| 39 | 39 | ||
| 40 | /** | 40 | /** |
| 41 | * 转换 - AiChatRoleDO | 41 | * 转换 - AiChatRoleDO |
| @@ -43,5 +43,5 @@ public interface ChatRoleConvert { | @@ -43,5 +43,5 @@ public interface ChatRoleConvert { | ||
| 43 | * @param req | 43 | * @param req |
| 44 | * @return | 44 | * @return |
| 45 | */ | 45 | */ |
| 46 | - AiChatRoleDO convertAiChatRoleDO(ChatRoleUpdateReq req); | 46 | + AiChatRoleDO convertAiChatRoleDO(AiChatRoleUpdateReq req); |
| 47 | } | 47 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/mapper/AiChatMessageMapper.java
| @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.ai.mapper; | @@ -3,7 +3,6 @@ package cn.iocoder.yudao.module.ai.mapper; | ||
| 3 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; | 3 | import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; |
| 4 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 4 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 5 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; | 5 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; |
| 6 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | ||
| 7 | import org.apache.ibatis.annotations.Mapper; | 6 | import org.apache.ibatis.annotations.Mapper; |
| 8 | import org.springframework.stereotype.Repository; | 7 | import org.springframework.stereotype.Repository; |
| 9 | 8 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatConversationService.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatConversationService.java
| 1 | package cn.iocoder.yudao.module.ai.service; | 1 | package cn.iocoder.yudao.module.ai.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateRoleReq; | ||
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateUserReq; | ||
| 5 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationListReq; | ||
| 6 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationRes; | 3 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateRoleReq; |
| 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateUserReq; | ||
| 5 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationListReq; | ||
| 6 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationRes; | ||
| 7 | 7 | ||
| 8 | import java.util.List; | 8 | import java.util.List; |
| 9 | 9 | ||
| @@ -13,7 +13,7 @@ import java.util.List; | @@ -13,7 +13,7 @@ import java.util.List; | ||
| 13 | * @fansili | 13 | * @fansili |
| 14 | * @since v1.0 | 14 | * @since v1.0 |
| 15 | */ | 15 | */ |
| 16 | -public interface ChatConversationService { | 16 | +public interface AiChatConversationService { |
| 17 | 17 | ||
| 18 | /** | 18 | /** |
| 19 | * 对话 - 创建普通对话 | 19 | * 对话 - 创建普通对话 |
| @@ -21,7 +21,7 @@ public interface ChatConversationService { | @@ -21,7 +21,7 @@ public interface ChatConversationService { | ||
| 21 | * @param req | 21 | * @param req |
| 22 | * @return | 22 | * @return |
| 23 | */ | 23 | */ |
| 24 | - ChatConversationRes createConversation(ChatConversationCreateUserReq req); | 24 | + AiChatConversationRes createConversation(AiChatConversationCreateUserReq req); |
| 25 | 25 | ||
| 26 | /** | 26 | /** |
| 27 | * 对话 - 创建role对话 | 27 | * 对话 - 创建role对话 |
| @@ -29,7 +29,7 @@ public interface ChatConversationService { | @@ -29,7 +29,7 @@ public interface ChatConversationService { | ||
| 29 | * @param req | 29 | * @param req |
| 30 | * @return | 30 | * @return |
| 31 | */ | 31 | */ |
| 32 | - ChatConversationRes createRoleConversation(ChatConversationCreateRoleReq req); | 32 | + AiChatConversationRes createRoleConversation(AiChatConversationCreateRoleReq req); |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| @@ -38,7 +38,7 @@ public interface ChatConversationService { | @@ -38,7 +38,7 @@ public interface ChatConversationService { | ||
| 38 | * @param id | 38 | * @param id |
| 39 | * @return | 39 | * @return |
| 40 | */ | 40 | */ |
| 41 | - ChatConversationRes getConversation(Long id); | 41 | + AiChatConversationRes getConversation(Long id); |
| 42 | 42 | ||
| 43 | /** | 43 | /** |
| 44 | * 获取 - 对话列表 | 44 | * 获取 - 对话列表 |
| @@ -46,7 +46,7 @@ public interface ChatConversationService { | @@ -46,7 +46,7 @@ public interface ChatConversationService { | ||
| 46 | * @param req | 46 | * @param req |
| 47 | * @return | 47 | * @return |
| 48 | */ | 48 | */ |
| 49 | - List<ChatConversationRes> listConversation(ChatConversationListReq req); | 49 | + List<AiChatConversationRes> listConversation(AiChatConversationListReq req); |
| 50 | 50 | ||
| 51 | /** | 51 | /** |
| 52 | * 删除 - 根据id | 52 | * 删除 - 根据id |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatMessageService.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatMessageService.java
| 1 | package cn.iocoder.yudao.module.ai.service; | 1 | package cn.iocoder.yudao.module.ai.service; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageListRes; | ||
| 5 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageListRes; |
| 5 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageReq; | ||
| 6 | 6 | ||
| 7 | /** | 7 | /** |
| 8 | * chat message | 8 | * chat message |
| @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | @@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | ||
| 11 | * @time 2024/4/24 17:25 | 11 | * @time 2024/4/24 17:25 |
| 12 | * @since 1.0 | 12 | * @since 1.0 |
| 13 | */ | 13 | */ |
| 14 | -public interface ChatMessageService { | 14 | +public interface AiChatMessageService { |
| 15 | 15 | ||
| 16 | /** | 16 | /** |
| 17 | * message - 列表 | 17 | * message - 列表 |
| @@ -19,7 +19,7 @@ public interface ChatMessageService { | @@ -19,7 +19,7 @@ public interface ChatMessageService { | ||
| 19 | * @param req | 19 | * @param req |
| 20 | * @return | 20 | * @return |
| 21 | */ | 21 | */ |
| 22 | - PageResult<ChatMessageListRes> list(ChatMessageReq req); | 22 | + PageResult<AiChatMessageListRes> list(AiChatMessageReq req); |
| 23 | 23 | ||
| 24 | /** | 24 | /** |
| 25 | * message - 删除 | 25 | * message - 删除 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatRoleService.java
| 1 | package cn.iocoder.yudao.module.ai.service; | 1 | package cn.iocoder.yudao.module.ai.service; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.framework.common.pojo.CommonResult; | ||
| 4 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 3 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 5 | import cn.iocoder.yudao.module.ai.vo.*; | 4 | import cn.iocoder.yudao.module.ai.vo.*; |
| 6 | 5 | ||
| 7 | -import java.util.List; | ||
| 8 | - | ||
| 9 | /** | 6 | /** |
| 10 | * chat 角色 | 7 | * chat 角色 |
| 11 | * | 8 | * |
| 12 | * @fansili | 9 | * @fansili |
| 13 | * @since v1.0 | 10 | * @since v1.0 |
| 14 | */ | 11 | */ |
| 15 | -public interface ChatRoleService { | 12 | +public interface AiChatRoleService { |
| 16 | 13 | ||
| 17 | /** | 14 | /** |
| 18 | * 获取聊天角色列表 | 15 | * 获取聊天角色列表 |
| @@ -20,7 +17,7 @@ public interface ChatRoleService { | @@ -20,7 +17,7 @@ public interface ChatRoleService { | ||
| 20 | * @param req | 17 | * @param req |
| 21 | * @return | 18 | * @return |
| 22 | */ | 19 | */ |
| 23 | - PageResult<ChatRoleListRes> list(ChatRoleListReq req); | 20 | + PageResult<AiChatRoleListRes> list(AiChatRoleListReq req); |
| 24 | 21 | ||
| 25 | /** | 22 | /** |
| 26 | * chat角色 - 添加 | 23 | * chat角色 - 添加 |
| @@ -28,7 +25,7 @@ public interface ChatRoleService { | @@ -28,7 +25,7 @@ public interface ChatRoleService { | ||
| 28 | * @param req | 25 | * @param req |
| 29 | * @return | 26 | * @return |
| 30 | */ | 27 | */ |
| 31 | - void add(ChatRoleAddReq req); | 28 | + void add(AiChatRoleAddReq req); |
| 32 | 29 | ||
| 33 | /** | 30 | /** |
| 34 | * chat角色 - 修改 | 31 | * chat角色 - 修改 |
| @@ -36,7 +33,7 @@ public interface ChatRoleService { | @@ -36,7 +33,7 @@ public interface ChatRoleService { | ||
| 36 | * @param id | 33 | * @param id |
| 37 | * @param req | 34 | * @param req |
| 38 | */ | 35 | */ |
| 39 | - void update(Long id, ChatRoleUpdateReq req); | 36 | + void update(Long id, AiChatRoleUpdateReq req); |
| 40 | 37 | ||
| 41 | 38 | ||
| 42 | /** | 39 | /** |
| @@ -45,7 +42,7 @@ public interface ChatRoleService { | @@ -45,7 +42,7 @@ public interface ChatRoleService { | ||
| 45 | * @param id | 42 | * @param id |
| 46 | * @param req | 43 | * @param req |
| 47 | */ | 44 | */ |
| 48 | - void updateVisibility(Long id, ChatRoleUpdateVisibilityReq req); | 45 | + void updateVisibility(Long id, AiChatRoleUpdateVisibilityReq req); |
| 49 | 46 | ||
| 50 | /** | 47 | /** |
| 51 | * chat角色 - 删除 | 48 | * chat角色 - 删除 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatService.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatService.java
| 1 | package cn.iocoder.yudao.module.ai.service; | 1 | package cn.iocoder.yudao.module.ai.service; |
| 2 | 2 | ||
| 3 | import cn.iocoder.yudao.module.ai.controller.Utf8SseEmitter; | 3 | import cn.iocoder.yudao.module.ai.controller.Utf8SseEmitter; |
| 4 | -import cn.iocoder.yudao.module.ai.vo.ChatReq; | 4 | +import cn.iocoder.yudao.module.ai.vo.AiChatReq; |
| 5 | 5 | ||
| 6 | /** | 6 | /** |
| 7 | * 聊天 chat | 7 | * 聊天 chat |
| @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.ai.vo.ChatReq; | @@ -10,7 +10,7 @@ import cn.iocoder.yudao.module.ai.vo.ChatReq; | ||
| 10 | * @time 2024/4/14 15:55 | 10 | * @time 2024/4/14 15:55 |
| 11 | * @since 1.0 | 11 | * @since 1.0 |
| 12 | */ | 12 | */ |
| 13 | -public interface ChatService { | 13 | +public interface AiChatService { |
| 14 | 14 | ||
| 15 | /** | 15 | /** |
| 16 | * chat | 16 | * chat |
| @@ -18,7 +18,7 @@ public interface ChatService { | @@ -18,7 +18,7 @@ public interface ChatService { | ||
| 18 | * @param req | 18 | * @param req |
| 19 | * @return | 19 | * @return |
| 20 | */ | 20 | */ |
| 21 | - String chat(ChatReq req); | 21 | + String chat(AiChatReq req); |
| 22 | 22 | ||
| 23 | /** | 23 | /** |
| 24 | * chat stream | 24 | * chat stream |
| @@ -27,5 +27,5 @@ public interface ChatService { | @@ -27,5 +27,5 @@ public interface ChatService { | ||
| 27 | * @param sseEmitter | 27 | * @param sseEmitter |
| 28 | * @return | 28 | * @return |
| 29 | */ | 29 | */ |
| 30 | - void chatStream(ChatReq req, Utf8SseEmitter sseEmitter); | 30 | + void chatStream(AiChatReq req, Utf8SseEmitter sseEmitter); |
| 31 | } | 31 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatConversationServiceImpl.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatConversationServiceImpl.java
| @@ -3,17 +3,17 @@ package cn.iocoder.yudao.module.ai.service.impl; | @@ -3,17 +3,17 @@ package cn.iocoder.yudao.module.ai.service.impl; | ||
| 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | 3 | import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; |
| 4 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | 4 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 5 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; | 5 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; |
| 6 | -import cn.iocoder.yudao.module.ai.convert.ChatConversationConvert; | 6 | +import cn.iocoder.yudao.module.ai.convert.AiChatConversationConvert; |
| 7 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; | 7 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; |
| 8 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; | 8 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; |
| 9 | -import cn.iocoder.yudao.module.ai.enums.ChatConversationTypeEnum; | 9 | +import cn.iocoder.yudao.module.ai.enums.AiChatConversationTypeEnum; |
| 10 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; | 10 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; |
| 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; | 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; |
| 12 | -import cn.iocoder.yudao.module.ai.service.ChatConversationService; | ||
| 13 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateRoleReq; | ||
| 14 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationCreateUserReq; | ||
| 15 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationListReq; | ||
| 16 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationRes; | 12 | +import cn.iocoder.yudao.module.ai.service.AiChatConversationService; |
| 13 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateRoleReq; | ||
| 14 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationCreateUserReq; | ||
| 15 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationListReq; | ||
| 16 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationRes; | ||
| 17 | import lombok.AllArgsConstructor; | 17 | import lombok.AllArgsConstructor; |
| 18 | import lombok.extern.slf4j.Slf4j; | 18 | import lombok.extern.slf4j.Slf4j; |
| 19 | import org.jetbrains.annotations.NotNull; | 19 | import org.jetbrains.annotations.NotNull; |
| @@ -30,51 +30,51 @@ import java.util.List; | @@ -30,51 +30,51 @@ import java.util.List; | ||
| 30 | @Service | 30 | @Service |
| 31 | @Slf4j | 31 | @Slf4j |
| 32 | @AllArgsConstructor | 32 | @AllArgsConstructor |
| 33 | -public class ChatConversationServiceImpl implements ChatConversationService { | 33 | +public class AiChatConversationServiceImpl implements AiChatConversationService { |
| 34 | 34 | ||
| 35 | private final AiChatRoleMapper aiChatRoleMapper; | 35 | private final AiChatRoleMapper aiChatRoleMapper; |
| 36 | private final AiChatConversationMapper aiChatConversationMapper; | 36 | private final AiChatConversationMapper aiChatConversationMapper; |
| 37 | 37 | ||
| 38 | @Override | 38 | @Override |
| 39 | - public ChatConversationRes createConversation(ChatConversationCreateUserReq req) { | 39 | + public AiChatConversationRes createConversation(AiChatConversationCreateUserReq req) { |
| 40 | // 获取用户id | 40 | // 获取用户id |
| 41 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); | 41 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
| 42 | // 查询最新的对话 | 42 | // 查询最新的对话 |
| 43 | AiChatConversationDO latestConversation = aiChatConversationMapper.selectLatestConversation(loginUserId); | 43 | AiChatConversationDO latestConversation = aiChatConversationMapper.selectLatestConversation(loginUserId); |
| 44 | // 如果有对话没有被使用过,那就返回这个 | 44 | // 如果有对话没有被使用过,那就返回这个 |
| 45 | if (latestConversation != null && latestConversation.getChatCount() <= 0) { | 45 | if (latestConversation != null && latestConversation.getChatCount() <= 0) { |
| 46 | - return ChatConversationConvert.INSTANCE.covnertChatConversationRes(latestConversation); | 46 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationRes(latestConversation); |
| 47 | } | 47 | } |
| 48 | // 创建新的 Conversation | 48 | // 创建新的 Conversation |
| 49 | AiChatConversationDO insertConversation = saveConversation(req.getTitle(), loginUserId, | 49 | AiChatConversationDO insertConversation = saveConversation(req.getTitle(), loginUserId, |
| 50 | - null, null, ChatConversationTypeEnum.USER_CHAT); | 50 | + null, null, AiChatConversationTypeEnum.USER_CHAT); |
| 51 | // 转换 res | 51 | // 转换 res |
| 52 | - return ChatConversationConvert.INSTANCE.covnertChatConversationRes(insertConversation); | 52 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationRes(insertConversation); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | @Override | 55 | @Override |
| 56 | - public ChatConversationRes createRoleConversation(ChatConversationCreateRoleReq req) { | 56 | + public AiChatConversationRes createRoleConversation(AiChatConversationCreateRoleReq req) { |
| 57 | // 获取用户id | 57 | // 获取用户id |
| 58 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); | 58 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
| 59 | // 查询最新的对话 | 59 | // 查询最新的对话 |
| 60 | AiChatConversationDO latestConversation = aiChatConversationMapper.selectLatestConversation(loginUserId); | 60 | AiChatConversationDO latestConversation = aiChatConversationMapper.selectLatestConversation(loginUserId); |
| 61 | // 如果有对话没有被使用过,那就返回这个 | 61 | // 如果有对话没有被使用过,那就返回这个 |
| 62 | if (latestConversation != null && latestConversation.getChatCount() <= 0) { | 62 | if (latestConversation != null && latestConversation.getChatCount() <= 0) { |
| 63 | - return ChatConversationConvert.INSTANCE.covnertChatConversationRes(latestConversation); | 63 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationRes(latestConversation); |
| 64 | } | 64 | } |
| 65 | AiChatRoleDO aiChatRoleDO = aiChatRoleMapper.selectById(req.getChatRoleId()); | 65 | AiChatRoleDO aiChatRoleDO = aiChatRoleMapper.selectById(req.getChatRoleId()); |
| 66 | // 创建新的 Conversation | 66 | // 创建新的 Conversation |
| 67 | AiChatConversationDO insertConversation = saveConversation(req.getTitle(), loginUserId, | 67 | AiChatConversationDO insertConversation = saveConversation(req.getTitle(), loginUserId, |
| 68 | - req.getChatRoleId(), aiChatRoleDO.getRoleName(), ChatConversationTypeEnum.ROLE_CHAT); | 68 | + req.getChatRoleId(), aiChatRoleDO.getRoleName(), AiChatConversationTypeEnum.ROLE_CHAT); |
| 69 | // 转换 res | 69 | // 转换 res |
| 70 | - return ChatConversationConvert.INSTANCE.covnertChatConversationRes(insertConversation); | 70 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationRes(insertConversation); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | private @NotNull AiChatConversationDO saveConversation(String title, | 73 | private @NotNull AiChatConversationDO saveConversation(String title, |
| 74 | Long userId, | 74 | Long userId, |
| 75 | Long chatRoleId, | 75 | Long chatRoleId, |
| 76 | String chatRoleName, | 76 | String chatRoleName, |
| 77 | - ChatConversationTypeEnum typeEnum) { | 77 | + AiChatConversationTypeEnum typeEnum) { |
| 78 | AiChatConversationDO insertConversation = new AiChatConversationDO(); | 78 | AiChatConversationDO insertConversation = new AiChatConversationDO(); |
| 79 | insertConversation.setId(null); | 79 | insertConversation.setId(null); |
| 80 | insertConversation.setUserId(userId); | 80 | insertConversation.setUserId(userId); |
| @@ -88,22 +88,22 @@ public class ChatConversationServiceImpl implements ChatConversationService { | @@ -88,22 +88,22 @@ public class ChatConversationServiceImpl implements ChatConversationService { | ||
| 88 | } | 88 | } |
| 89 | 89 | ||
| 90 | @Override | 90 | @Override |
| 91 | - public ChatConversationRes getConversation(Long id) { | 91 | + public AiChatConversationRes getConversation(Long id) { |
| 92 | AiChatConversationDO aiChatConversationDO = aiChatConversationMapper.selectById(id); | 92 | AiChatConversationDO aiChatConversationDO = aiChatConversationMapper.selectById(id); |
| 93 | if (aiChatConversationDO == null) { | 93 | if (aiChatConversationDO == null) { |
| 94 | throw ServiceExceptionUtil.exception(ErrorCodeConstants.AI_CHAT_CONTINUE_NOT_EXIST); | 94 | throw ServiceExceptionUtil.exception(ErrorCodeConstants.AI_CHAT_CONTINUE_NOT_EXIST); |
| 95 | } | 95 | } |
| 96 | - return ChatConversationConvert.INSTANCE.covnertChatConversationRes(aiChatConversationDO); | 96 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationRes(aiChatConversationDO); |
| 97 | } | 97 | } |
| 98 | 98 | ||
| 99 | @Override | 99 | @Override |
| 100 | - public List<ChatConversationRes> listConversation(ChatConversationListReq req) { | 100 | + public List<AiChatConversationRes> listConversation(AiChatConversationListReq req) { |
| 101 | // 获取用户id | 101 | // 获取用户id |
| 102 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); | 102 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
| 103 | // 查询前100对话 | 103 | // 查询前100对话 |
| 104 | List<AiChatConversationDO> top100Conversation | 104 | List<AiChatConversationDO> top100Conversation |
| 105 | = aiChatConversationMapper.selectTop100Conversation(loginUserId, req.getSearch()); | 105 | = aiChatConversationMapper.selectTop100Conversation(loginUserId, req.getSearch()); |
| 106 | - return ChatConversationConvert.INSTANCE.covnertChatConversationResList(top100Conversation); | 106 | + return AiChatConversationConvert.INSTANCE.covnertChatConversationResList(top100Conversation); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | @Override | 109 | @Override |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatMessageServiceImpl.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatMessageServiceImpl.java
| @@ -5,14 +5,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | @@ -5,14 +5,14 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 5 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 5 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 6 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | 6 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 7 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; | 7 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; |
| 8 | -import cn.iocoder.yudao.module.ai.convert.ChatMessageConvert; | 8 | +import cn.iocoder.yudao.module.ai.convert.AiChatMessageConvert; |
| 9 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; | 9 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatConversationDO; |
| 10 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; | 10 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatMessageDO; |
| 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; | 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; |
| 12 | import cn.iocoder.yudao.module.ai.mapper.AiChatMessageMapper; | 12 | import cn.iocoder.yudao.module.ai.mapper.AiChatMessageMapper; |
| 13 | -import cn.iocoder.yudao.module.ai.service.ChatMessageService; | ||
| 14 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageListRes; | ||
| 15 | -import cn.iocoder.yudao.module.ai.vo.ChatMessageReq; | 13 | +import cn.iocoder.yudao.module.ai.service.AiChatMessageService; |
| 14 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageListRes; | ||
| 15 | +import cn.iocoder.yudao.module.ai.vo.AiChatMessageReq; | ||
| 16 | import lombok.AllArgsConstructor; | 16 | import lombok.AllArgsConstructor; |
| 17 | import lombok.extern.slf4j.Slf4j; | 17 | import lombok.extern.slf4j.Slf4j; |
| 18 | import org.springframework.stereotype.Service; | 18 | import org.springframework.stereotype.Service; |
| @@ -29,13 +29,13 @@ import java.util.List; | @@ -29,13 +29,13 @@ import java.util.List; | ||
| 29 | @AllArgsConstructor | 29 | @AllArgsConstructor |
| 30 | @Service | 30 | @Service |
| 31 | @Slf4j | 31 | @Slf4j |
| 32 | -public class ChatMessageServiceImpl implements ChatMessageService { | 32 | +public class AiChatMessageServiceImpl implements AiChatMessageService { |
| 33 | 33 | ||
| 34 | private final AiChatMessageMapper aiChatMessageMapper; | 34 | private final AiChatMessageMapper aiChatMessageMapper; |
| 35 | private final AiChatConversationMapper aiChatConversationMapper; | 35 | private final AiChatConversationMapper aiChatConversationMapper; |
| 36 | 36 | ||
| 37 | @Override | 37 | @Override |
| 38 | - public PageResult<ChatMessageListRes> list(ChatMessageReq req) { | 38 | + public PageResult<AiChatMessageListRes> list(AiChatMessageReq req) { |
| 39 | // 查询 | 39 | // 查询 |
| 40 | LambdaQueryWrapperX<AiChatMessageDO> queryWrapperX = new LambdaQueryWrapperX<>(); | 40 | LambdaQueryWrapperX<AiChatMessageDO> queryWrapperX = new LambdaQueryWrapperX<>(); |
| 41 | queryWrapperX.eq(AiChatMessageDO::getChatConversationId, req.getChatConversationId()); | 41 | queryWrapperX.eq(AiChatMessageDO::getChatConversationId, req.getChatConversationId()); |
| @@ -43,7 +43,7 @@ public class ChatMessageServiceImpl implements ChatMessageService { | @@ -43,7 +43,7 @@ public class ChatMessageServiceImpl implements ChatMessageService { | ||
| 43 | queryWrapperX.orderByDesc(AiChatMessageDO::getId); | 43 | queryWrapperX.orderByDesc(AiChatMessageDO::getId); |
| 44 | PageResult<AiChatMessageDO> pageResult = aiChatMessageMapper.selectPage(req, queryWrapperX); | 44 | PageResult<AiChatMessageDO> pageResult = aiChatMessageMapper.selectPage(req, queryWrapperX); |
| 45 | // 转换 res | 45 | // 转换 res |
| 46 | - List<ChatMessageListRes> messageListResList = ChatMessageConvert.INSTANCE.convert(pageResult.getList()); | 46 | + List<AiChatMessageListRes> messageListResList = AiChatMessageConvert.INSTANCE.convert(pageResult.getList()); |
| 47 | return new PageResult(messageListResList, pageResult.getTotal()); | 47 | return new PageResult(messageListResList, pageResult.getTotal()); |
| 48 | } | 48 | } |
| 49 | 49 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatModalServiceImpl.java
| @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | @@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; | ||
| 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; | 5 | import cn.iocoder.yudao.framework.common.pojo.PageResult; |
| 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 7 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; | 7 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; |
| 8 | -import cn.iocoder.yudao.module.ai.convert.ChatModalConvert; | 8 | +import cn.iocoder.yudao.module.ai.convert.AiChatModalConvert; |
| 9 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatModalDO; | 9 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatModalDO; |
| 10 | import cn.iocoder.yudao.module.ai.enums.AiChatModalDisableEnum; | 10 | import cn.iocoder.yudao.module.ai.enums.AiChatModalDisableEnum; |
| 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatModalMapper; | 11 | import cn.iocoder.yudao.module.ai.mapper.AiChatModalMapper; |
| @@ -47,14 +47,14 @@ public class AiChatModalServiceImpl implements AiChatModalService { | @@ -47,14 +47,14 @@ public class AiChatModalServiceImpl implements AiChatModalService { | ||
| 47 | // 查询 | 47 | // 查询 |
| 48 | PageResult<AiChatModalDO> aiChatModalDOPageResult = aiChatModalMapper.selectPage(req, queryWrapperX); | 48 | PageResult<AiChatModalDO> aiChatModalDOPageResult = aiChatModalMapper.selectPage(req, queryWrapperX); |
| 49 | // 转换 res | 49 | // 转换 res |
| 50 | - List<AiChatModalListRes> resList = ChatModalConvert.INSTANCE.convertAiChatModalListRes(aiChatModalDOPageResult.getList()); | 50 | + List<AiChatModalListRes> resList = AiChatModalConvert.INSTANCE.convertAiChatModalListRes(aiChatModalDOPageResult.getList()); |
| 51 | return new PageResult<>(resList, aiChatModalDOPageResult.getTotal()); | 51 | return new PageResult<>(resList, aiChatModalDOPageResult.getTotal()); |
| 52 | } | 52 | } |
| 53 | 53 | ||
| 54 | @Override | 54 | @Override |
| 55 | public void add(AiChatModalAddReq req) { | 55 | public void add(AiChatModalAddReq req) { |
| 56 | // 转换 do | 56 | // 转换 do |
| 57 | - AiChatModalDO insertChatModalDO = ChatModalConvert.INSTANCE.convertAiChatModalDO(req); | 57 | + AiChatModalDO insertChatModalDO = AiChatModalConvert.INSTANCE.convertAiChatModalDO(req); |
| 58 | // | 58 | // |
| 59 | insertChatModalDO.setDisable(AiChatModalDisableEnum.NO.getValue()); | 59 | insertChatModalDO.setDisable(AiChatModalDisableEnum.NO.getValue()); |
| 60 | // 保存数据库 | 60 | // 保存数据库 |
| @@ -66,7 +66,7 @@ public class AiChatModalServiceImpl implements AiChatModalService { | @@ -66,7 +66,7 @@ public class AiChatModalServiceImpl implements AiChatModalService { | ||
| 66 | // 校验模型是否存在 | 66 | // 校验模型是否存在 |
| 67 | validateChatModalExists(id); | 67 | validateChatModalExists(id); |
| 68 | // 转换 updateChatModalDO | 68 | // 转换 updateChatModalDO |
| 69 | - AiChatModalDO updateChatModalDO = ChatModalConvert.INSTANCE.convertAiChatModalDO(req); | 69 | + AiChatModalDO updateChatModalDO = AiChatModalConvert.INSTANCE.convertAiChatModalDO(req); |
| 70 | updateChatModalDO.setId(id); | 70 | updateChatModalDO.setId(id); |
| 71 | // 更新数据库 | 71 | // 更新数据库 |
| 72 | aiChatModalMapper.updateById(updateChatModalDO); | 72 | aiChatModalMapper.updateById(updateChatModalDO); |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatRoleServiceImpl.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatRoleServiceImpl.java
| @@ -6,13 +6,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | @@ -6,13 +6,13 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; | ||
| 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; | 6 | import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; |
| 7 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; | 7 | import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; |
| 8 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; | 8 | import cn.iocoder.yudao.module.ai.ErrorCodeConstants; |
| 9 | -import cn.iocoder.yudao.module.ai.convert.ChatRoleConvert; | 9 | +import cn.iocoder.yudao.module.ai.convert.AiChatRoleConvert; |
| 10 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; | 10 | import cn.iocoder.yudao.module.ai.dal.dataobject.AiChatRoleDO; |
| 11 | -import cn.iocoder.yudao.module.ai.enums.ChatRoleClassifyEnum; | ||
| 12 | -import cn.iocoder.yudao.module.ai.enums.ChatRoleSourceEnum; | ||
| 13 | -import cn.iocoder.yudao.module.ai.enums.ChatRoleVisibilityEnum; | 11 | +import cn.iocoder.yudao.module.ai.enums.AiChatRoleClassifyEnum; |
| 12 | +import cn.iocoder.yudao.module.ai.enums.AiChatRoleSourceEnum; | ||
| 13 | +import cn.iocoder.yudao.module.ai.enums.AiChatRoleVisibilityEnum; | ||
| 14 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; | 14 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; |
| 15 | -import cn.iocoder.yudao.module.ai.service.ChatRoleService; | 15 | +import cn.iocoder.yudao.module.ai.service.AiChatRoleService; |
| 16 | import cn.iocoder.yudao.module.ai.vo.*; | 16 | import cn.iocoder.yudao.module.ai.vo.*; |
| 17 | import lombok.AllArgsConstructor; | 17 | import lombok.AllArgsConstructor; |
| 18 | import lombok.extern.slf4j.Slf4j; | 18 | import lombok.extern.slf4j.Slf4j; |
| @@ -29,12 +29,12 @@ import java.util.List; | @@ -29,12 +29,12 @@ import java.util.List; | ||
| 29 | @Service | 29 | @Service |
| 30 | @AllArgsConstructor | 30 | @AllArgsConstructor |
| 31 | @Slf4j | 31 | @Slf4j |
| 32 | -public class ChatRoleServiceImpl implements ChatRoleService { | 32 | +public class AiChatRoleServiceImpl implements AiChatRoleService { |
| 33 | 33 | ||
| 34 | private final AiChatRoleMapper aiChatRoleMapper; | 34 | private final AiChatRoleMapper aiChatRoleMapper; |
| 35 | 35 | ||
| 36 | @Override | 36 | @Override |
| 37 | - public PageResult<ChatRoleListRes> list(ChatRoleListReq req) { | 37 | + public PageResult<AiChatRoleListRes> list(AiChatRoleListReq req) { |
| 38 | // 查询条件 | 38 | // 查询条件 |
| 39 | LambdaQueryWrapperX<AiChatRoleDO> queryWrapperX = new LambdaQueryWrapperX<>(); | 39 | LambdaQueryWrapperX<AiChatRoleDO> queryWrapperX = new LambdaQueryWrapperX<>(); |
| 40 | // search 查询 | 40 | // search 查询 |
| @@ -48,18 +48,18 @@ public class ChatRoleServiceImpl implements ChatRoleService { | @@ -48,18 +48,18 @@ public class ChatRoleServiceImpl implements ChatRoleService { | ||
| 48 | Long total = aiChatRoleDOPageResult.getTotal(); | 48 | Long total = aiChatRoleDOPageResult.getTotal(); |
| 49 | List<AiChatRoleDO> roleList = aiChatRoleDOPageResult.getList(); | 49 | List<AiChatRoleDO> roleList = aiChatRoleDOPageResult.getList(); |
| 50 | // 换货res | 50 | // 换货res |
| 51 | - List<ChatRoleListRes> chatRoleListResList = ChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList); | 51 | + List<AiChatRoleListRes> chatRoleListResList = AiChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList); |
| 52 | return new PageResult<>(chatRoleListResList, total); | 52 | return new PageResult<>(chatRoleListResList, total); |
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | @Override | 55 | @Override |
| 56 | - public void add(ChatRoleAddReq req) { | 56 | + public void add(AiChatRoleAddReq req) { |
| 57 | // 转换enum,并校验enum | 57 | // 转换enum,并校验enum |
| 58 | - ChatRoleClassifyEnum.valueOfClassify(req.getClassify()); | ||
| 59 | - ChatRoleVisibilityEnum.valueOfType(req.getVisibility()); | ||
| 60 | - ChatRoleSourceEnum.valueOfType(req.getRoleSource()); | 58 | + AiChatRoleClassifyEnum.valueOfClassify(req.getClassify()); |
| 59 | + AiChatRoleVisibilityEnum.valueOfType(req.getVisibility()); | ||
| 60 | + AiChatRoleSourceEnum.valueOfType(req.getRoleSource()); | ||
| 61 | // 转换do | 61 | // 转换do |
| 62 | - AiChatRoleDO insertAiChatRoleDO = ChatRoleConvert.INSTANCE.convertAiChatRoleDO(req); | 62 | + AiChatRoleDO insertAiChatRoleDO = AiChatRoleConvert.INSTANCE.convertAiChatRoleDO(req); |
| 63 | insertAiChatRoleDO.setUserId(SecurityFrameworkUtils.getLoginUserId()); | 63 | insertAiChatRoleDO.setUserId(SecurityFrameworkUtils.getLoginUserId()); |
| 64 | insertAiChatRoleDO.setUseCount(0); | 64 | insertAiChatRoleDO.setUseCount(0); |
| 65 | // 保存 | 65 | // 保存 |
| @@ -67,24 +67,24 @@ public class ChatRoleServiceImpl implements ChatRoleService { | @@ -67,24 +67,24 @@ public class ChatRoleServiceImpl implements ChatRoleService { | ||
| 67 | } | 67 | } |
| 68 | 68 | ||
| 69 | @Override | 69 | @Override |
| 70 | - public void update(Long id, ChatRoleUpdateReq req) { | 70 | + public void update(Long id, AiChatRoleUpdateReq req) { |
| 71 | // 转换enum,并校验enum | 71 | // 转换enum,并校验enum |
| 72 | - ChatRoleClassifyEnum.valueOfClassify(req.getClassify()); | ||
| 73 | - ChatRoleVisibilityEnum.valueOfType(req.getVisibility()); | ||
| 74 | - ChatRoleSourceEnum.valueOfType(req.getRoleSource()); | 72 | + AiChatRoleClassifyEnum.valueOfClassify(req.getClassify()); |
| 73 | + AiChatRoleVisibilityEnum.valueOfType(req.getVisibility()); | ||
| 74 | + AiChatRoleSourceEnum.valueOfType(req.getRoleSource()); | ||
| 75 | // 检查角色是否存在 | 75 | // 检查角色是否存在 |
| 76 | validateChatRoleExists(id); | 76 | validateChatRoleExists(id); |
| 77 | // 转换do | 77 | // 转换do |
| 78 | - AiChatRoleDO updateChatRole = ChatRoleConvert.INSTANCE.convertAiChatRoleDO(req); | 78 | + AiChatRoleDO updateChatRole = AiChatRoleConvert.INSTANCE.convertAiChatRoleDO(req); |
| 79 | updateChatRole.setId(id); | 79 | updateChatRole.setId(id); |
| 80 | aiChatRoleMapper.updateById(updateChatRole); | 80 | aiChatRoleMapper.updateById(updateChatRole); |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | 83 | ||
| 84 | @Override | 84 | @Override |
| 85 | - public void updateVisibility(Long id, ChatRoleUpdateVisibilityReq req) { | 85 | + public void updateVisibility(Long id, AiChatRoleUpdateVisibilityReq req) { |
| 86 | // 转换enum,并校验enum | 86 | // 转换enum,并校验enum |
| 87 | - ChatRoleVisibilityEnum.valueOfType(req.getVisibility()); | 87 | + AiChatRoleVisibilityEnum.valueOfType(req.getVisibility()); |
| 88 | // 检查角色是否存在 | 88 | // 检查角色是否存在 |
| 89 | validateChatRoleExists(id); | 89 | validateChatRoleExists(id); |
| 90 | // 更新 | 90 | // 更新 |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatServiceImpl.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatServiceImpl.java
| @@ -12,10 +12,10 @@ import cn.iocoder.yudao.module.ai.enums.AiClientNameEnum; | @@ -12,10 +12,10 @@ import cn.iocoder.yudao.module.ai.enums.AiClientNameEnum; | ||
| 12 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; | 12 | import cn.iocoder.yudao.module.ai.mapper.AiChatConversationMapper; |
| 13 | import cn.iocoder.yudao.module.ai.mapper.AiChatMessageMapper; | 13 | import cn.iocoder.yudao.module.ai.mapper.AiChatMessageMapper; |
| 14 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; | 14 | import cn.iocoder.yudao.module.ai.mapper.AiChatRoleMapper; |
| 15 | -import cn.iocoder.yudao.module.ai.service.ChatConversationService; | ||
| 16 | -import cn.iocoder.yudao.module.ai.service.ChatService; | ||
| 17 | -import cn.iocoder.yudao.module.ai.vo.ChatConversationRes; | ||
| 18 | -import cn.iocoder.yudao.module.ai.vo.ChatReq; | 15 | +import cn.iocoder.yudao.module.ai.service.AiChatConversationService; |
| 16 | +import cn.iocoder.yudao.module.ai.service.AiChatService; | ||
| 17 | +import cn.iocoder.yudao.module.ai.vo.AiChatConversationRes; | ||
| 18 | +import cn.iocoder.yudao.module.ai.vo.AiChatReq; | ||
| 19 | import lombok.AllArgsConstructor; | 19 | import lombok.AllArgsConstructor; |
| 20 | import lombok.extern.slf4j.Slf4j; | 20 | import lombok.extern.slf4j.Slf4j; |
| 21 | import org.springframework.http.MediaType; | 21 | import org.springframework.http.MediaType; |
| @@ -36,13 +36,13 @@ import java.util.function.Consumer; | @@ -36,13 +36,13 @@ import java.util.function.Consumer; | ||
| 36 | @Slf4j | 36 | @Slf4j |
| 37 | @Service | 37 | @Service |
| 38 | @AllArgsConstructor | 38 | @AllArgsConstructor |
| 39 | -public class ChatServiceImpl implements ChatService { | 39 | +public class AiChatServiceImpl implements AiChatService { |
| 40 | 40 | ||
| 41 | private final AiClient aiClient; | 41 | private final AiClient aiClient; |
| 42 | private final AiChatRoleMapper aiChatRoleMapper; | 42 | private final AiChatRoleMapper aiChatRoleMapper; |
| 43 | private final AiChatMessageMapper aiChatMessageMapper; | 43 | private final AiChatMessageMapper aiChatMessageMapper; |
| 44 | private final AiChatConversationMapper aiChatConversationMapper; | 44 | private final AiChatConversationMapper aiChatConversationMapper; |
| 45 | - private final ChatConversationService chatConversationService; | 45 | + private final AiChatConversationService chatConversationService; |
| 46 | 46 | ||
| 47 | /** | 47 | /** |
| 48 | * chat | 48 | * chat |
| @@ -51,12 +51,12 @@ public class ChatServiceImpl implements ChatService { | @@ -51,12 +51,12 @@ public class ChatServiceImpl implements ChatService { | ||
| 51 | * @return | 51 | * @return |
| 52 | */ | 52 | */ |
| 53 | @Transactional(rollbackFor = Exception.class) | 53 | @Transactional(rollbackFor = Exception.class) |
| 54 | - public String chat(ChatReq req) { | 54 | + public String chat(AiChatReq req) { |
| 55 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); | 55 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
| 56 | // 获取 client 类型 | 56 | // 获取 client 类型 |
| 57 | AiClientNameEnum clientNameEnum = AiClientNameEnum.valueOfName(req.getModal()); | 57 | AiClientNameEnum clientNameEnum = AiClientNameEnum.valueOfName(req.getModal()); |
| 58 | // 获取对话信息 | 58 | // 获取对话信息 |
| 59 | - ChatConversationRes conversationRes = chatConversationService.getConversation(req.getConversationId()); | 59 | + AiChatConversationRes conversationRes = chatConversationService.getConversation(req.getConversationId()); |
| 60 | // 保存 chat message | 60 | // 保存 chat message |
| 61 | saveChatMessage(req, conversationRes, loginUserId); | 61 | saveChatMessage(req, conversationRes, loginUserId); |
| 62 | String content = null; | 62 | String content = null; |
| @@ -80,7 +80,7 @@ public class ChatServiceImpl implements ChatService { | @@ -80,7 +80,7 @@ public class ChatServiceImpl implements ChatService { | ||
| 80 | return content; | 80 | return content; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | - private void saveChatMessage(ChatReq req, ChatConversationRes conversationRes, Long loginUserId) { | 83 | + private void saveChatMessage(AiChatReq req, AiChatConversationRes conversationRes, Long loginUserId) { |
| 84 | Long chatConversationId = conversationRes.getId(); | 84 | Long chatConversationId = conversationRes.getId(); |
| 85 | // 增加 chat message 记录 | 85 | // 增加 chat message 记录 |
| 86 | aiChatMessageMapper.insert( | 86 | aiChatMessageMapper.insert( |
| @@ -98,7 +98,7 @@ public class ChatServiceImpl implements ChatService { | @@ -98,7 +98,7 @@ public class ChatServiceImpl implements ChatService { | ||
| 98 | aiChatConversationMapper.updateIncrChatCount(req.getConversationId()); | 98 | aiChatConversationMapper.updateIncrChatCount(req.getConversationId()); |
| 99 | } | 99 | } |
| 100 | 100 | ||
| 101 | - public void saveSystemChatMessage(ChatReq req, ChatConversationRes conversationRes, Long loginUserId, String systemPrompts) { | 101 | + public void saveSystemChatMessage(AiChatReq req, AiChatConversationRes conversationRes, Long loginUserId, String systemPrompts) { |
| 102 | Long chatConversationId = conversationRes.getId(); | 102 | Long chatConversationId = conversationRes.getId(); |
| 103 | // 增加 chat message 记录 | 103 | // 增加 chat message 记录 |
| 104 | aiChatMessageMapper.insert( | 104 | aiChatMessageMapper.insert( |
| @@ -125,12 +125,12 @@ public class ChatServiceImpl implements ChatService { | @@ -125,12 +125,12 @@ public class ChatServiceImpl implements ChatService { | ||
| 125 | * @return | 125 | * @return |
| 126 | */ | 126 | */ |
| 127 | @Override | 127 | @Override |
| 128 | - public void chatStream(ChatReq req, Utf8SseEmitter sseEmitter) { | 128 | + public void chatStream(AiChatReq req, Utf8SseEmitter sseEmitter) { |
| 129 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); | 129 | Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); |
| 130 | // 获取 client 类型 | 130 | // 获取 client 类型 |
| 131 | AiClientNameEnum clientNameEnum = AiClientNameEnum.valueOfName(req.getModal()); | 131 | AiClientNameEnum clientNameEnum = AiClientNameEnum.valueOfName(req.getModal()); |
| 132 | // 获取对话信息 | 132 | // 获取对话信息 |
| 133 | - ChatConversationRes conversationRes = chatConversationService.getConversation(req.getConversationId()); | 133 | + AiChatConversationRes conversationRes = chatConversationService.getConversation(req.getConversationId()); |
| 134 | // 创建 chat 需要的 Prompt | 134 | // 创建 chat 需要的 Prompt |
| 135 | Prompt prompt = new Prompt(req.getPrompt()); | 135 | Prompt prompt = new Prompt(req.getPrompt()); |
| 136 | req.setTopK(req.getTopK()); | 136 | req.setTopK(req.getTopK()); |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatConversationCreateRoleReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatConversationCreateRoleReq.java
| @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | ||
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | @Accessors(chain = true) | 16 | @Accessors(chain = true) |
| 17 | -public class ChatConversationCreateRoleReq { | 17 | +public class AiChatConversationCreateRoleReq { |
| 18 | 18 | ||
| 19 | @Schema(description = "chat角色Id") | 19 | @Schema(description = "chat角色Id") |
| 20 | @NotNull(message = "聊天角色id不能为空!") | 20 | @NotNull(message = "聊天角色id不能为空!") |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatConversationCreateUserReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatConversationCreateUserReq.java
| @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | ||
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | @Accessors(chain = true) | 16 | @Accessors(chain = true) |
| 17 | -public class ChatConversationCreateUserReq { | 17 | +public class AiChatConversationCreateUserReq { |
| 18 | 18 | ||
| 19 | @Schema(description = "对话标题") | 19 | @Schema(description = "对话标题") |
| 20 | @NotNull(message = "标题不能为空!") | 20 | @NotNull(message = "标题不能为空!") |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatConversationListReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatConversationListReq.java
| @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | ||
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | @Accessors(chain = true) | 15 | @Accessors(chain = true) |
| 16 | -public class ChatConversationListReq { | 16 | +public class AiChatConversationListReq { |
| 17 | 17 | ||
| 18 | @Schema(description = "查询根据title") | 18 | @Schema(description = "查询根据title") |
| 19 | private String search; | 19 | private String search; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatConversationRes.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatConversationRes.java
| @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | ||
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | @Accessors(chain = true) | 15 | @Accessors(chain = true) |
| 16 | -public class ChatConversationRes { | 16 | +public class AiChatConversationRes { |
| 17 | 17 | ||
| 18 | @Schema(description = "id") | 18 | @Schema(description = "id") |
| 19 | private Long id; | 19 | private Long id; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatMessageDeleteReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatMessageDeleteReq.java
| @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | ||
| 15 | */ | 15 | */ |
| 16 | @Data | 16 | @Data |
| 17 | @Accessors(chain = true) | 17 | @Accessors(chain = true) |
| 18 | -public class ChatMessageDeleteReq extends PageParam { | 18 | +public class AiChatMessageDeleteReq extends PageParam { |
| 19 | 19 | ||
| 20 | @Schema(description = "id") | 20 | @Schema(description = "id") |
| 21 | @NotNull | 21 | @NotNull |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatMessageListRes.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatMessageListRes.java
| @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | ||
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | @Accessors(chain = true) | 15 | @Accessors(chain = true) |
| 16 | -public class ChatMessageListRes { | 16 | +public class AiChatMessageListRes { |
| 17 | 17 | ||
| 18 | @Schema(description = "编号") | 18 | @Schema(description = "编号") |
| 19 | private Long id; | 19 | private Long id; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatMessageReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatMessageReq.java
| @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | ||
| 15 | */ | 15 | */ |
| 16 | @Data | 16 | @Data |
| 17 | @Accessors(chain = true) | 17 | @Accessors(chain = true) |
| 18 | -public class ChatMessageReq extends PageParam { | 18 | +public class AiChatMessageReq extends PageParam { |
| 19 | 19 | ||
| 20 | @Schema(description = "聊天ID,关联到特定的会话或对话") | 20 | @Schema(description = "聊天ID,关联到特定的会话或对话") |
| 21 | @NotNull | 21 | @NotNull |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatReq.java
| @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | @@ -15,7 +15,7 @@ import lombok.experimental.Accessors; | ||
| 15 | */ | 15 | */ |
| 16 | @Data | 16 | @Data |
| 17 | @Accessors(chain = true) | 17 | @Accessors(chain = true) |
| 18 | -public class ChatReq { | 18 | +public class AiChatReq { |
| 19 | 19 | ||
| 20 | @Schema(description = "ai模型(查看 AiClientNameEnum)") | 20 | @Schema(description = "ai模型(查看 AiClientNameEnum)") |
| 21 | @NotNull(message = "模型不能为空!") | 21 | @NotNull(message = "模型不能为空!") |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatReqVO.java
| 1 | package cn.iocoder.yudao.module.ai.vo; | 1 | package cn.iocoder.yudao.module.ai.vo; |
| 2 | 2 | ||
| 3 | -import cn.iocoder.yudao.module.ai.enums.OpenAiModelEnum; | 3 | +import cn.iocoder.yudao.module.ai.enums.AiOpenAiModelEnum; |
| 4 | import io.swagger.v3.oas.annotations.media.Schema; | 4 | import io.swagger.v3.oas.annotations.media.Schema; |
| 5 | import jakarta.validation.constraints.NotNull; | 5 | import jakarta.validation.constraints.NotNull; |
| 6 | import lombok.Data; | 6 | import lombok.Data; |
| @@ -16,6 +16,6 @@ public class AiChatReqVO { | @@ -16,6 +16,6 @@ public class AiChatReqVO { | ||
| 16 | 16 | ||
| 17 | @Schema(description = "AI模型", requiredMode = Schema.RequiredMode.REQUIRED) | 17 | @Schema(description = "AI模型", requiredMode = Schema.RequiredMode.REQUIRED) |
| 18 | @NotNull(message = "AI模型不能为空") | 18 | @NotNull(message = "AI模型不能为空") |
| 19 | - private OpenAiModelEnum aiModel; | 19 | + private AiOpenAiModelEnum aiModel; |
| 20 | 20 | ||
| 21 | } | 21 | } |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleAddReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatRoleAddReq.java
| @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | ||
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | @Accessors(chain = true) | 16 | @Accessors(chain = true) |
| 17 | -public class ChatRoleAddReq extends PageParam { | 17 | +public class AiChatRoleAddReq extends PageParam { |
| 18 | 18 | ||
| 19 | @NotNull | 19 | @NotNull |
| 20 | @Schema(description = "模型编号,关联到角色使用的特定模型") | 20 | @Schema(description = "模型编号,关联到角色使用的特定模型") |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleListReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatRoleListReq.java
| @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; | ||
| 13 | */ | 13 | */ |
| 14 | @Data | 14 | @Data |
| 15 | @Accessors(chain = true) | 15 | @Accessors(chain = true) |
| 16 | -public class ChatRoleListReq extends PageParam { | 16 | +public class AiChatRoleListReq extends PageParam { |
| 17 | 17 | ||
| 18 | @Schema(description = "查询") | 18 | @Schema(description = "查询") |
| 19 | private String search; | 19 | private String search; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleListRes.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatRoleListRes.java
| @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; | @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; | ||
| 12 | */ | 12 | */ |
| 13 | @Data | 13 | @Data |
| 14 | @Accessors(chain = true) | 14 | @Accessors(chain = true) |
| 15 | -public class ChatRoleListRes { | 15 | +public class AiChatRoleListRes { |
| 16 | 16 | ||
| 17 | @Schema(description = "id") | 17 | @Schema(description = "id") |
| 18 | private Long id; | 18 | private Long id; |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatRoleUpdateReq.java
| @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | ||
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | @Accessors(chain = true) | 16 | @Accessors(chain = true) |
| 17 | -public class ChatRoleUpdateReq extends PageParam { | 17 | +public class AiChatRoleUpdateReq extends PageParam { |
| 18 | 18 | ||
| 19 | @NotNull | 19 | @NotNull |
| 20 | @Schema(description = "模型编号,关联到角色使用的特定模型") | 20 | @Schema(description = "模型编号,关联到角色使用的特定模型") |
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateVisibilityReq.java renamed to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/AiChatRoleUpdateVisibilityReq.java
| @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | @@ -14,7 +14,7 @@ import lombok.experimental.Accessors; | ||
| 14 | */ | 14 | */ |
| 15 | @Data | 15 | @Data |
| 16 | @Accessors(chain = true) | 16 | @Accessors(chain = true) |
| 17 | -public class ChatRoleUpdateVisibilityReq extends PageParam { | 17 | +public class AiChatRoleUpdateVisibilityReq extends PageParam { |
| 18 | 18 | ||
| 19 | @NotNull | 19 | @NotNull |
| 20 | @Schema(description = "发布状态,0表示仅自己可见,1表示公开,2表示禁用") | 20 | @Schema(description = "发布状态,0表示仅自己可见,1表示公开,2表示禁用") |