From f438e68dc9659bf1253a39fd2b9b052c3a997dd1 Mon Sep 17 00:00:00 2001 From: cherishsince Date: Tue, 7 May 2024 11:49:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91=E9=87=8D?= =?UTF-8?q?=E5=91=BD=E5=90=8D=20role=20req=20=E5=92=8Cres=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0vo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/controller/admin/model/AiChatRoleController.java | 2 +- .../{AiChatRoleListReq.java => AiChatRoleListReqVO.java} | 2 +- .../{AiChatRoleListRes.java => AiChatRoleListRespVO.java} | 2 +- .../vo/role/{AiChatRoleRes.java => AiChatRoleRespVO.java} | 2 +- .../yudao/module/ai/convert/AiChatRoleConvert.java | 8 ++++---- .../yudao/module/ai/service/AiChatRoleService.java | 4 ++-- .../ai/service/impl/AiChatConversationServiceImpl.java | 4 ++-- .../module/ai/service/impl/AiChatRoleServiceImpl.java | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) rename yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/{AiChatRoleListReq.java => AiChatRoleListReqVO.java} (88%) rename yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/{AiChatRoleListRes.java => AiChatRoleListRespVO.java} (95%) rename yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/{AiChatRoleRes.java => AiChatRoleRespVO.java} (96%) diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java index 64a06632ab..1aab426002 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/AiChatRoleController.java @@ -29,7 +29,7 @@ public class AiChatRoleController { @Operation(summary = "chat角色 - 角色列表") @GetMapping("/list") - public PageResult list(@Validated @ModelAttribute AiChatRoleListReq req) { + public PageResult list(@Validated @ModelAttribute AiChatRoleListReqVO req) { return chatRoleService.list(req); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReq.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReqVO.java similarity index 88% rename from yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReq.java rename to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReqVO.java index 5662398a78..247154a4cd 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReq.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReqVO.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class AiChatRoleListReq extends PageParam { +public class AiChatRoleListReqVO extends PageParam { @Schema(description = "查询") private String search; diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRes.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRespVO.java similarity index 95% rename from yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRes.java rename to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRespVO.java index 5aee6a3d2e..f66d5a6ea5 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRes.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRespVO.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class AiChatRoleListRes { +public class AiChatRoleListRespVO { @Schema(description = "id") private Long id; diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRes.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRespVO.java similarity index 96% rename from yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRes.java rename to yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRespVO.java index 6b4ec9d225..a28dd4f4cf 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRes.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRespVO.java @@ -12,7 +12,7 @@ import lombok.experimental.Accessors; */ @Data @Accessors(chain = true) -public class AiChatRoleRes { +public class AiChatRoleRespVO { @Schema(description = "id") private Long id; diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatRoleConvert.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatRoleConvert.java index 86ed30e220..269b4a6ee9 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatRoleConvert.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/convert/AiChatRoleConvert.java @@ -2,9 +2,9 @@ package cn.iocoder.yudao.module.ai.convert; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO; import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleAddReqVO; -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRes; +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRespVO; import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleUpdateReqVO; -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleListRes; +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleListRespVO; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; @@ -28,7 +28,7 @@ public interface AiChatRoleConvert { * @param roleList * @return */ - List convertChatRoleListRes(List roleList); + List convertChatRoleListRes(List roleList); /** * 转换 - AiChatRoleDO @@ -52,5 +52,5 @@ public interface AiChatRoleConvert { * @param aiChatRoleDO * @return */ - AiChatRoleRes convertAiChatRoleRes(AiChatRoleDO aiChatRoleDO); + AiChatRoleRespVO convertAiChatRoleRes(AiChatRoleDO aiChatRoleDO); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatRoleService.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatRoleService.java index 2ad696fb0f..96d7221002 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatRoleService.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/AiChatRoleService.java @@ -18,7 +18,7 @@ public interface AiChatRoleService { * @param req * @return */ - PageResult list(AiChatRoleListReq req); + PageResult list(AiChatRoleListReqVO req); /** * chat角色 - 添加 @@ -56,7 +56,7 @@ public interface AiChatRoleService { * @param roleId * @return */ - AiChatRoleRes getChatRole(Long roleId); + AiChatRoleRespVO getChatRole(Long roleId); /** * 校验 - 角色是否存在 diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatConversationServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatConversationServiceImpl.java index 34332959f1..228ab75e16 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatConversationServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatConversationServiceImpl.java @@ -8,7 +8,7 @@ import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatCo import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationRespVO; import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationUpdateReqVO; import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiChatModalRespVO; -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRes; +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRespVO; import cn.iocoder.yudao.module.ai.convert.AiChatConversationConvert; import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO; import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModalDO; @@ -47,7 +47,7 @@ public class AiChatConversationServiceImpl implements AiChatConversationService // 默认使用 sort 排序第一个模型 AiChatModalDO aiChatModalDO = aiChatModalMapper.selectFirstModal(); // 查询角色 - AiChatRoleRes chatRoleRes = null; + AiChatRoleRespVO chatRoleRes = null; if (req.getRoleId() != null) { chatRoleRes = aiChatRoleService.getChatRole(req.getRoleId()); } diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatRoleServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatRoleServiceImpl.java index b3e645e372..5264ea2a23 100644 --- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatRoleServiceImpl.java +++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/impl/AiChatRoleServiceImpl.java @@ -35,7 +35,7 @@ public class AiChatRoleServiceImpl implements AiChatRoleService { private final AiChatModalService aiChatModalService; @Override - public PageResult list(AiChatRoleListReq req) { + public PageResult list(AiChatRoleListReqVO req) { // 查询条件 LambdaQueryWrapperX queryWrapperX = new LambdaQueryWrapperX<>(); // search 查询 @@ -49,7 +49,7 @@ public class AiChatRoleServiceImpl implements AiChatRoleService { Long total = aiChatRoleDOPageResult.getTotal(); List roleList = aiChatRoleDOPageResult.getList(); // 换货res - List chatRoleListResList = AiChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList); + List chatRoleListResList = AiChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList); return new PageResult<>(chatRoleListResList, total); } @@ -103,7 +103,7 @@ public class AiChatRoleServiceImpl implements AiChatRoleService { } @Override - public AiChatRoleRes getChatRole(Long roleId) { + public AiChatRoleRespVO getChatRole(Long roleId) { // 检查角色是否存在 AiChatRoleDO aiChatRoleDO = validateExists(roleId); return AiChatRoleConvert.INSTANCE.convertAiChatRoleRes(aiChatRoleDO);