diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/IImContentService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/IImContentService.java index 34e3c3da..223798dd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/IImContentService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/IImContentService.java @@ -20,6 +20,6 @@ public interface IImContentService extends IService { IPage> listHistoryMessage(Page page, ImContent imContent); - ImContent completions(ImContent imContent, MultipartFile file); + Map completions(ImContent imContent, MultipartFile file); } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java index 494e471b..7257abad 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java @@ -1,5 +1,6 @@ package com.cloud.kicc.system.service.impl; +import cn.hutool.core.convert.Convert; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; @@ -67,7 +68,7 @@ public class ImContentServiceImpl extends ServiceImpl completions(ImContent imContent, MultipartFile file) { SecurityUtils.openInterfaceTemporaryLoginSession(imContent.getSendUserId()); if (imContent.getContentType().equals(ImMessageTypeEnum.AUDIO.getValue())) { Optional.ofNullable(file).orElseThrow(() -> new CheckedException("当前语音文件为空,请检查后重试!")); @@ -133,14 +134,17 @@ public class ImContentServiceImpl extends ServiceImpl result = Convert.toMap(String.class, Object.class, content); + result.putAll(Convert.toMap(String.class, Object.class, receiveOssOssFile)); + return result; } else { // 保存AI回复聊天记录 ImContent content = askChatCompletion(imContent); super.save(content); - return content; + return Convert.toMap(String.class, Object.class, content); } } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml index 9034d09d..711a7f25 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml @@ -30,7 +30,7 @@ and (im.send_user_id = #{ew.sendUserId} and im.receive_user_id = #{ew.receiveUserId}) or (im.send_user_id = #{ew.receiveUserId} and im.receive_user_id = #{ew.sendUserId}) - order by im.send_time asc + order by im.send_time desc