jqb/agent_9art
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

数据格式处理

Browse Source
This commit is contained in:
qinyong@9artedu.com 2026-06-11 17:34:20 +08:00
parent 7a89cd2a71
commit abebd62ca8
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/generation-service/src/main/java/com/artedu/generation/controller/GenerationController.java
View File

@ -152,8 +152,9 @@ public class GenerationController {
log.warn("toUser无效，使用兜底查询, fromUser={}, toUser={}", fromUser, toUser); log.warn("toUser无效，使用兜底查询, fromUser={}, toUser={}", fromUser, toUser);
messages = archiveMessageMapper.selectMessagesByFromUser(fromUser, startTime, endTime); messages = archiveMessageMapper.selectMessagesByFromUser(fromUser, startTime, endTime);
} else { } else {
toUser = "[\""+toUser+"\"]"; String toUser_m = "[\""+toUser+"\"]";
messages = archiveMessageMapper.selectSingleChatMessages(fromUser, toUser, startTime, endTime); String fromUser_m = "[\""+fromUser+"\"]";
messages = archiveMessageMapper.selectSingleChatMessages(fromUser, toUser, startTime, endTime, toUser_m, fromUser_m);
} }
} }

9
backend/generation-service/src/main/java/com/artedu/generation/mapper/ArchiveMessageMapper.java
View File

@ -13,12 +13,12 @@ public interface ArchiveMessageMapper extends BaseMapper<ArchiveMessage> {
@Select("<script>" + @Select("<script>" +
"(SELECT msgtime,created_at, from_role, content FROM archive_messages " + "(SELECT msgtime,created_at, from_role, content FROM archive_messages " +
"WHERE from_user = #{fromUser} AND to_user = #{toUser} " + "WHERE from_user = #{fromUser} AND to_user = #{toUser_m} " +
"AND msgtime >= #{startTime} AND msgtime &lt; #{endTime} AND msgtype='text' " + "AND msgtime >= #{startTime} AND msgtime &lt; #{endTime} AND msgtype='text' " +
"AND content IS NOT NULL AND content != '' limit 100) " + "AND content IS NOT NULL AND content != '' limit 100) " +
"UNION ALL " + "UNION ALL " +
"(SELECT msgtime,created_at, from_role, content FROM archive_messages " + "(SELECT msgtime,created_at, from_role, content FROM archive_messages " +
"WHERE from_user = #{toUser} AND to_user = #{fromUser} " + "WHERE from_user = #{toUser} AND to_user = #{fromUser_m} " +
"AND msgtime >= #{startTime} AND msgtime &lt; #{endTime} AND msgtype='text' " + "AND msgtime >= #{startTime} AND msgtime &lt; #{endTime} AND msgtype='text' " +
"AND content IS NOT NULL AND content != '' limit 100)" + "AND content IS NOT NULL AND content != '' limit 100)" +
"ORDER BY msgtime DESC" + "ORDER BY msgtime DESC" +
@ -26,7 +26,10 @@ public interface ArchiveMessageMapper extends BaseMapper<ArchiveMessage> {
List<ArchiveMessage> selectSingleChatMessages(@Param("fromUser") String fromUser, List<ArchiveMessage> selectSingleChatMessages(@Param("fromUser") String fromUser,
@Param("toUser") String toUser, @Param("toUser") String toUser,
@Param("startTime") Long startTime, @Param("startTime") Long startTime,
@Param("endTime") Long endTime); @Param("endTime") Long endTime,
@Param("toUser_m") String toUser_m,
@Param("fromUser_m") String fromUser_m
);
@Select("SELECT created_at, from_role, content FROM archive_messages " + @Select("SELECT created_at, from_role, content FROM archive_messages " +
"WHERE roomid = #{roomid} " + "WHERE roomid = #{roomid} " +

6
backend/generation-service/src/main/resources/application.yml
View File

@ -11,9 +11,9 @@ spring:
name: generation-service name: generation-service
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://${MYSQL_HOST:localhost}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:ai_assistant}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false url: jdbc:mysql://${MYSQL_HOST:sh-cdb-6fzlwnms.sql.tencentcdb.com}:${MYSQL_PORT:63912}/${MYSQL_DATABASE:ai_assistant}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
username: ${MYSQL_USERNAME:root} username: ${MYSQL_USERNAME:assistant_prod}
password: ${MYSQL_PASSWORD:root} password: ${MYSQL_PASSWORD:U%$4Tu_C3+4}
redis: redis:
host: ${REDIS_HOST:localhost} host: ${REDIS_HOST:localhost}
port: ${REDIS_PORT:6379} port: ${REDIS_PORT:6379}