zoujiajian 1 ano atrás
pai
commit
eaeb370a3f

+ 2 - 3
netflix-service/src/main/java/com/cyksj/server/listener/ConsoleStreamListener.java

@@ -2,7 +2,6 @@ package com.cyksj.server.listener;
 
 
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.cyksj.common.util.ImageUploadUtil;
 import com.cyksj.model.entity.MiniPopularizeUserConversationChat;
 import com.cyksj.model.gpt.Message;
@@ -55,7 +54,7 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 				//将用户使用次数返回
 				miniPopularizeCommonService.recoverUserLimit(userId, recoverNum);
 				miniPopularizeCommonService.saveImgRecord(setImagRecord(imgRecordId, img, MiniPopularizeUserConversationChat.Status.fail, content));
-				miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, "图片生成异常", MiniPopularizeUserConversationChat.Role.assistant);
+				miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.assistant);
 			}
 		}
 		SendMessageUtil.sendMessage(userId, message);
@@ -70,7 +69,7 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 		SendMessageUtil.sendMessage(userId, message);
 		message = Message.ofAssistant("[DONE]");
 		SendMessageUtil.sendMessage(userId, message);
-		miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, "图片生成异常", MiniPopularizeUserConversationChat.Role.sys);
+		miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.sys);
 	}
 
 	public MiniPopularizeUserConversationChat setImagRecord(Long imagRecordId, String img, MiniPopularizeUserConversationChat.Status status, String content) {

+ 1 - 1
netflix-service/src/main/java/com/cyksj/service/mini/MiniPopularizeCommonService.java

@@ -14,7 +14,7 @@ public interface MiniPopularizeCommonService {
 
 	void saveImgRecord(MiniPopularizeUserConversationChat record);
 
-	void recordChatEndOfAnswer(String conversationId, String content, MiniPopularizeUserConversationChat.Role role);
+	void recordChatEndOfAnswer(String conversationId, Long userId, String content, MiniPopularizeUserConversationChat.Role role);
 
 	void incrGptTimes(long userId, Integer oriNum, Integer addNum);
 }

+ 2 - 1
netflix-service/src/main/java/com/cyksj/service/mini/impl/MiniPopularizeCommonServiceImpl.java

@@ -43,10 +43,11 @@ public class MiniPopularizeCommonServiceImpl implements MiniPopularizeCommonServ
 	}
 
 	@Override
-	public void recordChatEndOfAnswer(String conversationId, String content, MiniPopularizeUserConversationChat.Role role) {
+	public void recordChatEndOfAnswer(String conversationId, Long userId, String content, MiniPopularizeUserConversationChat.Role role) {
 		MiniPopularizeUserConversationChat chat = MiniPopularizeUserConversationChat
 				.builder()
 				.conversationId(conversationId)
+				.userId(userId)
 				.content(content)
 				.type(MiniPopularizeUserConversationChat.Type.text)
 				.role(role).build();