diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/tik/service/chat/AiChatMessageServiceImpl.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/tik/service/chat/AiChatMessageServiceImpl.java index aa57d6d196..6c3f3e3844 100644 --- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/tik/service/chat/AiChatMessageServiceImpl.java +++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/tik/service/chat/AiChatMessageServiceImpl.java @@ -257,7 +257,7 @@ public class AiChatMessageServiceImpl implements AiChatMessageService { reasoningContentBuffer.append(newReasoningContent); } return success(new AiChatMessageSendRespVO() - .setSend(BeanUtils.toBean(userMessage, AiChatMessageSendRespVO.Message.class)) + //.setSend(BeanUtils.toBean(userMessage, AiChatMessageSendRespVO.Message.class)) .setReceive(BeanUtils.toBean(assistantMessage, AiChatMessageSendRespVO.Message.class) .setContent(StrUtil.nullToDefault(newContent, "")) // 避免 null 的 情况 .setReasoningContent(StrUtil.nullToDefault(newReasoningContent, "")) // 避免 null 的 情况 diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatConversationController.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatConversationController.java similarity index 93% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatConversationController.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatConversationController.java index e33eb6c7cc..bc7307f3d5 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatConversationController.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatConversationController.java @@ -1,11 +1,11 @@ -package cn.iocoder.yudao.module.tik.chat.controller.app; +package cn.iocoder.yudao.module.tik.chat.controller; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatConversationCreateMyReqVO; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatConversationRespVO; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatConversationUpdateMyReqVO; +import cn.iocoder.yudao.module.tik.chat.vo.AppAiChatConversationCreateMyReqVO; +import cn.iocoder.yudao.module.tik.chat.vo.AppAiChatConversationRespVO; +import cn.iocoder.yudao.module.tik.chat.vo.AppAiChatConversationUpdateMyReqVO; import cn.iocoder.yudao.module.tik.controller.admin.chat.vo.conversation.AiChatConversationCreateMyReqVO; import cn.iocoder.yudao.module.tik.controller.admin.chat.vo.conversation.AiChatConversationUpdateMyReqVO; import cn.iocoder.yudao.module.tik.dal.dataobject.chat.AiChatConversationDO; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatMessageController.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatMessageController.java similarity index 65% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatMessageController.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatMessageController.java index e62ef0c500..07491217dd 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/app/AppAiChatMessageController.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/controller/AppAiChatMessageController.java @@ -1,12 +1,10 @@ -package cn.iocoder.yudao.module.tik.chat.controller.app; +package cn.iocoder.yudao.module.tik.chat.controller; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjUtil; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatMessageRespVO; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatMessageSendReqVO; -import cn.iocoder.yudao.module.tik.chat.vo.app.AppAiChatMessageSendRespVO; +import cn.iocoder.yudao.module.tik.chat.vo.AppAiChatMessageRespVO; import cn.iocoder.yudao.module.tik.controller.admin.chat.vo.message.AiChatMessageSendReqVO; import cn.iocoder.yudao.module.tik.controller.admin.chat.vo.message.AiChatMessageSendRespVO; import cn.iocoder.yudao.module.tik.dal.dataobject.chat.AiChatConversationDO; @@ -52,68 +50,6 @@ public class AppAiChatMessageController { @Resource private AiKnowledgeDocumentService knowledgeDocumentService; - @Operation(summary = "发送消息(段式)", description = "一次性返回,响应较慢") - @PostMapping("/send") - public CommonResult sendMessage(@Valid @RequestBody AppAiChatMessageSendReqVO sendReqVO) { - // 将 App VO 转换为 Admin VO - AiChatMessageSendReqVO adminReqVO = BeanUtils.toBean(sendReqVO, AiChatMessageSendReqVO.class); - // 调用 Service,然后转换响应 - AiChatMessageSendRespVO adminResp = chatMessageService.sendMessage(adminReqVO, getLoginUserId()); - // 手动转换 segments,因为内部类类型不同 - AppAiChatMessageSendRespVO appResp = convertSendRespVO(adminResp); - return success(appResp); - } - - /** - * 将 Admin 的 SendRespVO 转换为 App 的 SendRespVO - * 主要处理 segments 字段的类型转换 - */ - private AppAiChatMessageSendRespVO convertSendRespVO(cn.iocoder.yudao.module.tik.controller.admin.chat.vo.message.AiChatMessageSendRespVO adminResp) { - if (adminResp == null) { - return null; - } - AppAiChatMessageSendRespVO appResp = new AppAiChatMessageSendRespVO(); - - // 转换 send - if (adminResp.getSend() != null) { - AppAiChatMessageSendRespVO.Message appSend = BeanUtils.toBean(adminResp.getSend(), AppAiChatMessageSendRespVO.Message.class); - if (adminResp.getSend().getSegments() != null) { - appSend.setSegments(convertKnowledgeSegments(adminResp.getSend().getSegments())); - } - appResp.setSend(appSend); - } - - // 转换 receive - if (adminResp.getReceive() != null) { - AppAiChatMessageSendRespVO.Message appReceive = BeanUtils.toBean(adminResp.getReceive(), AppAiChatMessageSendRespVO.Message.class); - if (adminResp.getReceive().getSegments() != null) { - appReceive.setSegments(convertKnowledgeSegments(adminResp.getReceive().getSegments())); - } - appResp.setReceive(appReceive); - } - - return appResp; - } - - /** - * 转换 KnowledgeSegment 列表 - */ - private List convertKnowledgeSegments( - List adminSegments) { - if (adminSegments == null) { - return null; - } - return convertList(adminSegments, segment -> { - if (segment == null) { - return null; - } - return new AppAiChatMessageSendRespVO.KnowledgeSegment() - .setId(segment.getId()) - .setContent(segment.getContent()) - .setDocumentId(segment.getDocumentId()) - .setDocumentName(segment.getDocumentName()); - }); - } @Operation(summary = "发送消息(流式)", description = "流式返回,响应较快") @PostMapping(value = "/send-stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE) diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationCreateMyReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationCreateMyReqVO.java similarity index 89% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationCreateMyReqVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationCreateMyReqVO.java index 05c6c78a42..029c9f795f 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationCreateMyReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationCreateMyReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationRespVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationRespVO.java similarity index 98% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationRespVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationRespVO.java index 0238af8c98..096fd8af61 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationRespVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import cn.iocoder.yudao.module.tik.dal.dataobject.model.AiChatRoleDO; import cn.iocoder.yudao.module.tik.dal.dataobject.model.AiModelDO; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationUpdateMyReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationUpdateMyReqVO.java similarity index 96% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationUpdateMyReqVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationUpdateMyReqVO.java index 444e209924..b38404b0da 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatConversationUpdateMyReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatConversationUpdateMyReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageRespVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageRespVO.java similarity index 98% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageRespVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageRespVO.java index 3a4118be7b..6029c176e7 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageRespVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import cn.iocoder.yudao.module.tik.framework.ai.core.webserch.AiWebSearchResponse; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendReqVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendReqVO.java similarity index 95% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendReqVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendReqVO.java index 13ca4892f3..fa83dd4472 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendReqVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotEmpty; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendRespVO.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendRespVO.java similarity index 98% rename from yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendRespVO.java rename to yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendRespVO.java index 0f826e9aa0..0907eaae6d 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/app/AppAiChatMessageSendRespVO.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/chat/vo/AppAiChatMessageSendRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.tik.chat.vo.app; +package cn.iocoder.yudao.module.tik.chat.vo; import cn.iocoder.yudao.module.tik.framework.ai.core.webserch.AiWebSearchResponse; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java index 2988e53c30..2da484d244 100644 --- a/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java +++ b/yudao-module-tik/src/main/java/cn/iocoder/yudao/module/tik/media/BatchProduceAlignment.java @@ -36,7 +36,7 @@ public class BatchProduceAlignment { private final String accessKeySecret = "kDqlGeJTKw6tJtFYiaY8vQTFuVIQDs"; - public static void main(String[] args) { + /*public static void main(String[] args) { try { BatchProduceAlignment batchProduce = new BatchProduceAlignment(); batchProduce.initClient(); @@ -78,7 +78,7 @@ public class BatchProduceAlignment { } catch (Exception e) { System.out.println("Produce failed. Exception: " + e.toString()); } - } + }*/ public void initClient() throws Exception {