fix 同会话校验去掉

netflix-dao/src/main/java/com/cyksj/mapper/mini/MiniPopularizeUserMapper.java

@@ -16,7 +16,7 @@ public interface MiniPopularizeUserMapper extends BaseMapper<MiniPopularizeUser>
 	int incrNum(@Param("userId") Long userId, @Param("num") Integer num);
 
 	@Update("update mini_popularize_user set num = num - #{num} where user_id = #{userId} and num = #{userNum} and num > 0")
-	int decLumaNum(@Param("userId") Long userId, @Param("num") Integer num, @Param("userNum") Integer userNum);
+	int decrNum(@Param("userId") Long userId, @Param("num") Integer num, @Param("userNum") Integer userNum);
 
 	@Update("update mini_popularize_user set num = num + #{addNum} where user_id = #{userId} and num = #{oriNum}")
 	int incrNumSync(@Param("userId") long userId, @Param("oriNum") Integer oriNum, @Param("addNum") Integer addNum);

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

@@ -6,7 +6,6 @@ import com.cyksj.common.constant.Constant;
 import com.cyksj.common.util.StringUtil;
 import com.cyksj.model.entity.MiniPopularizeUserConversationChat;
 import com.cyksj.model.gpt.Message;
-import com.cyksj.server.SendMessageUtil;
 import com.cyksj.service.mini.MiniPopularizeCommonService;
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;
@@ -56,7 +55,7 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 				//将用户使用次数返回
 				miniPopularizeCommonService.recoverUserLimit(userId, recoverNum);
 				miniPopularizeCommonService.saveImgRecord(setImagRecord(imgRecordId, img, MiniPopularizeUserConversationChat.Status.fail, content));
-				miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.assistant);
+//				miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.assistant);
 			}
 		}
 		//任务已完成 但图未出
@@ -77,11 +76,11 @@ public class ConsoleStreamListener extends AbstractStreamListener {
 		miniPopularizeCommonService.recoverUserLimit(userId, recoverNum);
 		miniPopularizeCommonService.saveImgRecord(setImagRecord(imgRecordId, null, MiniPopularizeUserConversationChat.Status.fail, StringUtil.getErrorText(throwable)));
 		log.error("gpt对话异常，异常：{}", response);
-		Message message = Message.ofAssistant("图片生成异常");
-		SendMessageUtil.sendMessage(userId, message);
-		message = Message.ofAssistant("[DONE]");
-		SendMessageUtil.sendMessage(userId, message);
-		miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.sys);
+//		Message message = Message.ofAssistant("图片生成异常");
+//		SendMessageUtil.sendMessage(userId, message);
+//		message = Message.ofAssistant("[DONE]");
+//		SendMessageUtil.sendMessage(userId, message);
+//		miniPopularizeCommonService.recordChatEndOfAnswer(conversationId, userId, "图片生成异常", MiniPopularizeUserConversationChat.Role.sys);
 	}
 
 	public MiniPopularizeUserConversationChat setImagRecord(Long imagRecordId, String img, MiniPopularizeUserConversationChat.Status status, String content) {

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

@@ -79,7 +79,7 @@ public class MiniPopularizeCommonServiceImpl implements MiniPopularizeCommonServ
 	@Override
 	public Boolean checkImageIsCompleted(Long imgRecordId) {
 		MiniPopularizeUserConversationChat dbChat = conversationChatMapper.selectById(imgRecordId);
-		if (dbChat == null || (dbChat.getType() == MiniPopularizeUserConversationChat.Type.image && StrUtil.isEmpty(dbChat.getImg()))) {
+		if (dbChat == null || (dbChat.getType() == MiniPopularizeUserConversationChat.Type.image && StrUtil.isEmpty(dbChat.getImg()) && dbChat.getStatus() == MiniPopularizeUserConversationChat.Status.processing)) {
 			return false;
 		}
 		return true;

netflix-service/src/main/java/com/cyksj/service/mini/impl/MiniPopularizeFrontServiceImpl.java

@@ -219,19 +219,19 @@ public class MiniPopularizeFrontServiceImpl implements MiniPopularizeFrontServic
 	}
 
 	private String checkUser(MiniPopularizeUserConversation conversation, String conversationId, AtomicBoolean recoverNum) {
-		if (conversationId != null) {
-			MiniPopularizeUserConversationChat miniPopularizeUserConversationChat = conversationChatMapper.selectOne(Wrappers.lambdaQuery(MiniPopularizeUserConversationChat.class)
-					.eq(MiniPopularizeUserConversationChat::getConversationId, conversationId)
-					.eq(MiniPopularizeUserConversationChat::getType, MiniPopularizeUserConversationChat.Type.image)
-					.orderByDesc(MiniPopularizeUserConversationChat::getId)
-					.last("limit 1"));
-			if (miniPopularizeUserConversationChat == null || !miniPopularizeUserConversationChat.getUserId().equals(conversation.getUserId())) {
-				throw BusinessRuntimeException.getInstance("系统错误");
-			} else if (miniPopularizeUserConversationChat.getStatus() != MiniPopularizeUserConversationChat.Status.success) {
-				throw BusinessRuntimeException.getInstance("图片还未生成，无法进行修改");
-			}
-			recoverNum.set(true);
-		}
+//		if (conversationId != null) {
+//			MiniPopularizeUserConversationChat miniPopularizeUserConversationChat = conversationChatMapper.selectOne(Wrappers.lambdaQuery(MiniPopularizeUserConversationChat.class)
+//					.eq(MiniPopularizeUserConversationChat::getConversationId, conversationId)
+//					.eq(MiniPopularizeUserConversationChat::getType, MiniPopularizeUserConversationChat.Type.image)
+//					.orderByDesc(MiniPopularizeUserConversationChat::getId)
+//					.last("limit 1"));
+//			if (miniPopularizeUserConversationChat == null || !miniPopularizeUserConversationChat.getUserId().equals(conversation.getUserId())) {
+//				throw BusinessRuntimeException.getInstance("系统错误");
+//			} else if (miniPopularizeUserConversationChat.getStatus() != MiniPopularizeUserConversationChat.Status.success) {
+//				throw BusinessRuntimeException.getInstance("图片还未生成，无法进行修改");
+//			}
+//			recoverNum.set(true);
+//		}
 		Long userId = conversation.getUserId();
 		//扣除次数
 		decrMiniUserGptNum(userId);
@@ -355,7 +355,7 @@ public class MiniPopularizeFrontServiceImpl implements MiniPopularizeFrontServic
 		if (user.getNum() == 0) {
 			throw BusinessRuntimeException.getInstance("无可用次数");
 		}
-		int i = miniPopularizeUserMapper.decLumaNum(userId, 1, user.getNum());
+		int i = miniPopularizeUserMapper.decrNum(userId, 1, user.getNum());
 		if (i == 0) {
 			throw BusinessRuntimeException.getInstance("网络异常，请稍后再试");
 		}