diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatRoleController.java index fbd3ae779..79da1bc8c 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatRoleController.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/ChatRoleController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; */ @Tag(name = "A4-chat角色") @RestController -@RequestMapping("/ai/chat/role") +@RequestMapping("/ai/chat") @Slf4j @AllArgsConstructor public class ChatRoleController { @@ -27,34 +27,35 @@ public class ChatRoleController { private final ChatRoleService chatRoleService; @Operation(summary = "chat角色 - 角色列表") - @GetMapping("/list") + @GetMapping("/role/list") public PageResult list(@Validated @ModelAttribute ChatRoleListReq req) { return chatRoleService.list(req); } @Operation(summary = "chat角色 - 添加") - @PutMapping("/add") + @PutMapping("/role") public CommonResult add(@Validated @RequestBody ChatRoleAddReq req) { chatRoleService.add(req); return CommonResult.success(null); } @Operation(summary = "chat角色 - 修改") - @PostMapping("/update") - public CommonResult update(@Validated @RequestBody ChatRoleUpdateReq req) { - chatRoleService.update(req); + @PostMapping("/role/{id}") + public CommonResult update(@PathVariable("id") Long id, + @Validated @RequestBody ChatRoleUpdateReq req) { + chatRoleService.update(id, req); return CommonResult.success(null); } @Operation(summary = "chat角色 - 修改可见性") - @PostMapping("/update-visibility") + @PostMapping("/role/update-visibility") public CommonResult updateVisibility(@Validated @RequestBody ChatRoleUpdateVisibilityReq req) { chatRoleService.updateVisibility(req); return CommonResult.success(null); } @Operation(summary = "chat角色 - 修改可见性") - @DeleteMapping("/delete") + @DeleteMapping("/role") public CommonResult 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/dal/dataobject/AiChatRoleDO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatRoleDO.java index 49ff42f87..4683a81fa 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatRoleDO.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/dal/dataobject/AiChatRoleDO.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.ai.dal.dataobject; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.experimental.Accessors; @@ -14,6 +15,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) +@TableName("ai_chat_role") public class AiChatRoleDO extends BaseDO { /** * 编号,表示聊天角色在数据库中的唯一标识符 @@ -52,7 +54,7 @@ public class AiChatRoleDO extends BaseDO { private String classify; /** - * 发布状态,0表示仅自己可见,1表示公开,2表示禁用 + * 发布状态,private 表示仅自己可见,public表示公开,disable表示禁用 */ private String visibility; 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 2b7734107..7302b4243 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 @@ -33,9 +33,10 @@ public interface ChatRoleService { /** * chat角色 - 修改 * + * @param id * @param req */ - void update(ChatRoleUpdateReq req); + void update(Long id, ChatRoleUpdateReq req); /** diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatRoleServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatRoleServiceImpl.java index 4f96840b5..a88d2a8e9 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatRoleServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/ChatRoleServiceImpl.java @@ -67,15 +67,16 @@ public class ChatRoleServiceImpl implements ChatRoleService { } @Override - public void update(ChatRoleUpdateReq req) { + public void update(Long id, ChatRoleUpdateReq req) { // 转换enum,并校验enum ChatRoleClassifyEnum.valueOfClassify(req.getClassify()); ChatRoleVisibilityEnum.valueOfType(req.getVisibility()); ChatRoleSourceEnum.valueOfType(req.getRoleSource()); // 检查角色是否存在 - validateChatRoleExists(req.getId()); + validateChatRoleExists(id); // 转换do AiChatRoleDO updateChatRole = ChatRoleConvert.INSTANCE.convertAiChatRoleDO(req); + updateChatRole.setId(id); aiChatRoleMapper.updateById(updateChatRole); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleAddReq.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleAddReq.java index da08f11cb..2c83bc59a 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleAddReq.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleAddReq.java @@ -37,7 +37,7 @@ public class ChatRoleAddReq extends PageParam { private String classify; @NotNull - @Schema(description = "发布状态,0表示仅自己可见,1表示公开,2表示禁用") + @Schema(description = "发布状态,private 表示仅自己可见,public表示公开,disable表示禁用\n") private String visibility; @NotNull diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateReq.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateReq.java index 3187fca43..6ec165ed8 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateReq.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/vo/ChatRoleUpdateReq.java @@ -16,11 +16,6 @@ import lombok.experimental.Accessors; @Accessors(chain = true) public class ChatRoleUpdateReq extends PageParam { - - @NotNull - @Schema(description = "编号") - private Long id; - @NotNull @Schema(description = "模型编号,关联到角色使用的特定模型") private String modelId;