From 239bc21f02809f33787163e63eb6d472a605bd39 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Sun, 14 Apr 2024 13:39:37 +0800
Subject: [PATCH] 调整 chat role 目录

---
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/AiChatReqVO.java     | 21 +++++++++++++++++++++
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/vo/AiChatReqVO.java          | 21 ---------------------
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/AiChatRoleController.java      | 57 ---------------------------------------------------------
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/chat/AiChatRoleController.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java                  |  1 +
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleServiceImpl.java              |  1 +
 6 files changed, 81 insertions(+), 78 deletions(-)
 create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/AiChatReqVO.java
 delete mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/vo/AiChatReqVO.java
 delete mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/AiChatRoleController.java
 create mode 100644 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/chat/AiChatRoleController.java

diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/AiChatReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/AiChatReqVO.java
new file mode 100644
index 0000000..881982a
--- /dev/null
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/chat/vo/AiChatReqVO.java
@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.ai.controller.admin.chat.vo;
+
+import cn.iocoder.yudao.module.ai.enums.OpenAiModelEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+// TODO done @fansili 1）swagger 注释不太对；2）有了 swagger 注释，就不用类注释了
+@Data
+@Schema(description = "用户 App - 上传文件 Request VO")
+public class AiChatReqVO {
+
+    @Schema(description = "提示词", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "提示词不能为空!")
+    private String prompt;
+
+    @Schema(description = "AI模型", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "AI模型不能为空")
+    private OpenAiModelEnum aiModel;
+
+}
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/vo/AiChatReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/vo/AiChatReqVO.java
deleted file mode 100644
index 643b660..0000000
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/vo/AiChatReqVO.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.iocoder.yudao.module.ai.controller.admin.vo;
-
-import cn.iocoder.yudao.module.ai.enums.OpenAiModelEnum;
-import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-// TODO done @fansili 1）swagger 注释不太对；2）有了 swagger 注释，就不用类注释了
-@Data
-@Schema(description = "用户 App - 上传文件 Request VO")
-public class AiChatReqVO {
-
-    @Schema(description = "提示词", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "提示词不能为空!")
-    private String prompt;
-
-    @Schema(description = "AI模型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "AI模型不能为空")
-    private OpenAiModelEnum aiModel;
-
-}
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/AiChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/AiChatRoleController.java
deleted file mode 100644
index 7103e37..0000000
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/AiChatRoleController.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.module.ai.controller.app;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.ai.controller.app.vo.*;
-import cn.iocoder.yudao.module.ai.service.ChatRoleService;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.AllArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * ai chat 角色
- *
- * @fansili
- * @since v1.0
- */
-@RestController
-@RequestMapping("/chat-role")
-@AllArgsConstructor
-public class AiChatRoleController {
-
-    private final ChatRoleService chatRoleService;
-
-    @Operation(summary = "chat角色 - 角色列表")
-    @GetMapping("/list")
-    public CommonResult<ChatRoleListRes> list(@Validated @ModelAttribute ChatRoleListReq req) {
-        return chatRoleService.list(req);
-    }
-
-    @Operation(summary = "chat角色 - 添加")
-    @PutMapping("/add")
-    public CommonResult<Void> add(@Validated @RequestBody ChatRoleAddReq req) {
-        chatRoleService.add(req);
-        return CommonResult.success(null);
-    }
-
-    @Operation(summary = "chat角色 - 修改")
-    @PostMapping("/update")
-    public CommonResult<Void> update(@Validated @RequestBody ChatRoleUpdateReq req) {
-        chatRoleService.update(req);
-        return CommonResult.success(null);
-    }
-
-    @Operation(summary = "chat角色 - 修改可见性")
-    @PostMapping("/update-visibility")
-    public CommonResult<Void> updateVisibility(@Validated @RequestBody ChatRoleUpdateVisibilityReq req) {
-        chatRoleService.updateVisibility(req);
-        return CommonResult.success(null);
-    }
-
-    @Operation(summary = "chat角色 - 修改可见性")
-    @DeleteMapping("/delete")
-    public CommonResult<Void> delete(@RequestParam("chatRoleId") Long chatRoleId) {
-        chatRoleService.delete(chatRoleId);
-        return CommonResult.success(null);
-    }
-}
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/chat/AiChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/chat/AiChatRoleController.java
new file mode 100644
index 0000000..e59ae9b
--- /dev/null
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/app/chat/AiChatRoleController.java
@@ -0,0 +1,58 @@
+package cn.iocoder.yudao.module.ai.controller.app.chat;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.ai.controller.app.chat.vo.*;
+import cn.iocoder.yudao.module.ai.controller.app.vo.*;
+import cn.iocoder.yudao.module.ai.service.ChatRoleService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * ai chat 角色
+ *
+ * @fansili
+ * @since v1.0
+ */
+@RestController
+@RequestMapping("/chat-role")
+@AllArgsConstructor
+public class AiChatRoleController {
+
+    private final ChatRoleService chatRoleService;
+
+    @Operation(summary = "chat角色 - 角色列表")
+    @GetMapping("/list")
+    public CommonResult<ChatRoleListRes> list(@Validated @ModelAttribute ChatRoleListReq req) {
+        return chatRoleService.list(req);
+    }
+
+    @Operation(summary = "chat角色 - 添加")
+    @PutMapping("/add")
+    public CommonResult<Void> add(@Validated @RequestBody ChatRoleAddReq req) {
+        chatRoleService.add(req);
+        return CommonResult.success(null);
+    }
+
+    @Operation(summary = "chat角色 - 修改")
+    @PostMapping("/update")
+    public CommonResult<Void> update(@Validated @RequestBody ChatRoleUpdateReq req) {
+        chatRoleService.update(req);
+        return CommonResult.success(null);
+    }
+
+    @Operation(summary = "chat角色 - 修改可见性")
+    @PostMapping("/update-visibility")
+    public CommonResult<Void> updateVisibility(@Validated @RequestBody ChatRoleUpdateVisibilityReq req) {
+        chatRoleService.updateVisibility(req);
+        return CommonResult.success(null);
+    }
+
+    @Operation(summary = "chat角色 - 修改可见性")
+    @DeleteMapping("/delete")
+    public CommonResult<Void> delete(@RequestParam("chatRoleId") Long chatRoleId) {
+        chatRoleService.delete(chatRoleId);
+        return CommonResult.success(null);
+    }
+}
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java
index 725ce77..ac92293 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleService.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.ai.service;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.ai.controller.app.chat.vo.*;
 import cn.iocoder.yudao.module.ai.controller.app.vo.*;
 
 /**
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleServiceImpl.java
index 7b93021..c386fb4 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleServiceImpl.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/ChatRoleServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.ai.service;
 
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.module.ai.controller.app.chat.vo.*;
 import cn.iocoder.yudao.module.ai.controller.app.vo.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
--
libgit2 0.21.4