Commit f438e68dc9659bf1253a39fd2b9b052c3a997dd1

Authored by cherishsince
1 parent 53f4ad43

【调整】重命名 role req 和res,增加vo

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 {
29 29  
30 30 @Operation(summary = "chat角色 - 角色列表")
31 31 @GetMapping("/list")
32   - public PageResult<AiChatRoleListRes> list(@Validated @ModelAttribute AiChatRoleListReq req) {
  32 + public PageResult<AiChatRoleListRespVO> list(@Validated @ModelAttribute AiChatRoleListReqVO req) {
33 33 return chatRoleService.list(req);
34 34 }
35 35  
... ...
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListReq.java renamed to 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;
13 13 */
14 14 @Data
15 15 @Accessors(chain = true)
16   -public class AiChatRoleListReq extends PageParam {
  16 +public class AiChatRoleListReqVO extends PageParam {
17 17  
18 18 @Schema(description = "查询")
19 19 private String search;
... ...
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleListRes.java renamed to 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;
12 12 */
13 13 @Data
14 14 @Accessors(chain = true)
15   -public class AiChatRoleListRes {
  15 +public class AiChatRoleListRespVO {
16 16  
17 17 @Schema(description = "id")
18 18 private Long id;
... ...
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/role/AiChatRoleRes.java renamed to 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;
12 12 */
13 13 @Data
14 14 @Accessors(chain = true)
15   -public class AiChatRoleRes {
  15 +public class AiChatRoleRespVO {
16 16  
17 17 @Schema(description = "id")
18 18 private Long id;
... ...
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;
2 2  
3 3 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatRoleDO;
4 4 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleAddReqVO;
5   -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRes;
  5 +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRespVO;
6 6 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleUpdateReqVO;
7   -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleListRes;
  7 +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleListRespVO;
8 8 import org.mapstruct.Mapper;
9 9 import org.mapstruct.factory.Mappers;
10 10  
... ... @@ -28,7 +28,7 @@ public interface AiChatRoleConvert {
28 28 * @param roleList
29 29 * @return
30 30 */
31   - List<AiChatRoleListRes> convertChatRoleListRes(List<AiChatRoleDO> roleList);
  31 + List<AiChatRoleListRespVO> convertChatRoleListRes(List<AiChatRoleDO> roleList);
32 32  
33 33 /**
34 34 * 转换 - AiChatRoleDO
... ... @@ -52,5 +52,5 @@ public interface AiChatRoleConvert {
52 52 * @param aiChatRoleDO
53 53 * @return
54 54 */
55   - AiChatRoleRes convertAiChatRoleRes(AiChatRoleDO aiChatRoleDO);
  55 + AiChatRoleRespVO convertAiChatRoleRes(AiChatRoleDO aiChatRoleDO);
56 56 }
... ...
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 {
18 18 * @param req
19 19 * @return
20 20 */
21   - PageResult<AiChatRoleListRes> list(AiChatRoleListReq req);
  21 + PageResult<AiChatRoleListRespVO> list(AiChatRoleListReqVO req);
22 22  
23 23 /**
24 24 * chat角色 - 添加
... ... @@ -56,7 +56,7 @@ public interface AiChatRoleService {
56 56 * @param roleId
57 57 * @return
58 58 */
59   - AiChatRoleRes getChatRole(Long roleId);
  59 + AiChatRoleRespVO getChatRole(Long roleId);
60 60  
61 61 /**
62 62 * 校验 - 角色是否存在
... ...
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
8 8 import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationRespVO;
9 9 import cn.iocoder.yudao.module.ai.controller.admin.chat.vo.conversation.AiChatConversationUpdateReqVO;
10 10 import cn.iocoder.yudao.module.ai.controller.admin.model.vo.model.AiChatModalRespVO;
11   -import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRes;
  11 +import cn.iocoder.yudao.module.ai.controller.admin.model.vo.role.AiChatRoleRespVO;
12 12 import cn.iocoder.yudao.module.ai.convert.AiChatConversationConvert;
13 13 import cn.iocoder.yudao.module.ai.dal.dataobject.chat.AiChatConversationDO;
14 14 import cn.iocoder.yudao.module.ai.dal.dataobject.model.AiChatModalDO;
... ... @@ -47,7 +47,7 @@ public class AiChatConversationServiceImpl implements AiChatConversationService
47 47 // 默认使用 sort 排序第一个模型
48 48 AiChatModalDO aiChatModalDO = aiChatModalMapper.selectFirstModal();
49 49 // 查询角色
50   - AiChatRoleRes chatRoleRes = null;
  50 + AiChatRoleRespVO chatRoleRes = null;
51 51 if (req.getRoleId() != null) {
52 52 chatRoleRes = aiChatRoleService.getChatRole(req.getRoleId());
53 53 }
... ...
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 {
35 35 private final AiChatModalService aiChatModalService;
36 36  
37 37 @Override
38   - public PageResult<AiChatRoleListRes> list(AiChatRoleListReq req) {
  38 + public PageResult<AiChatRoleListRespVO> list(AiChatRoleListReqVO req) {
39 39 // 查询条件
40 40 LambdaQueryWrapperX<AiChatRoleDO> queryWrapperX = new LambdaQueryWrapperX<>();
41 41 // search 查询
... ... @@ -49,7 +49,7 @@ public class AiChatRoleServiceImpl implements AiChatRoleService {
49 49 Long total = aiChatRoleDOPageResult.getTotal();
50 50 List<AiChatRoleDO> roleList = aiChatRoleDOPageResult.getList();
51 51 // 换货res
52   - List<AiChatRoleListRes> chatRoleListResList = AiChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList);
  52 + List<AiChatRoleListRespVO> chatRoleListResList = AiChatRoleConvert.INSTANCE.convertChatRoleListRes(roleList);
53 53 return new PageResult<>(chatRoleListResList, total);
54 54 }
55 55  
... ... @@ -103,7 +103,7 @@ public class AiChatRoleServiceImpl implements AiChatRoleService {
103 103 }
104 104  
105 105 @Override
106   - public AiChatRoleRes getChatRole(Long roleId) {
  106 + public AiChatRoleRespVO getChatRole(Long roleId) {
107 107 // 检查角色是否存在
108 108 AiChatRoleDO aiChatRoleDO = validateExists(roleId);
109 109 return AiChatRoleConvert.INSTANCE.convertAiChatRoleRes(aiChatRoleDO);
... ...