fix

netflix-dao/src/main/java/com/cyksj/mapper/MidjourneyUserConversationMapper.java

@@ -2,10 +2,12 @@ package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.MidjourneyUserConversation;
+import com.cyksj.model.views.MidjourneyUserConversationRecordHistoryView;
 import com.cyksj.model.views.MidjourneyUserDetailView;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author zwhui
@@ -14,4 +16,6 @@ import java.util.Date;
 public interface MidjourneyUserConversationMapper extends BaseMapper<MidjourneyUserConversation> {
 
 	MidjourneyUserDetailView getMjMirrorOrderDetail(@Param("relationId") Long relationId, @Param("startTime") Date startTime, @Param("expiryTime") Date expiryTime);
+
+	List<MidjourneyUserConversationRecordHistoryView> getMjCarHistory(@Param("userToken") String userToken);
 }

netflix-dao/src/main/java/com/cyksj/model/views/MidjourneyUserConversationRecordHistoryView.java

@@ -20,8 +20,6 @@ public class MidjourneyUserConversationRecordHistoryView {
     @DbField("r.user_token")
     private String userToken;
 
-    @DbField("m.user_token")
-    private String mjUserToken;
     /**
      * 提示词
      */

netflix-dao/src/main/resources/mapper/MidjourneyUserConversationMapper.xml

@@ -16,4 +16,8 @@
             and created_time < #{expiryTime}
         </if>
     </select>
+
+    <select id="getMjCarHistory" resultType="com.cyksj.model.views.MidjourneyUserConversationRecordHistoryView">
+        select r.user_token,r.prompt,r.conversation_id,r.created_time as conversationTime,r.car_id,r.car_name from (SELECT MAX(id) id from midjourney_user_conversation_record as m where m.user_token = #{userToken} GROUP BY m.car_id) t left join midjourney_user_conversation_record as r on t.id = r.id order by r.created_time desc
+    </select>
 </mapper>

netflix-web/src/main/java/com/cyksj/web/controller/mirror/MidjourneyController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
+import com.cyksj.mapper.MidjourneyUserConversationMapper;
 import com.cyksj.mapper.UpgradePackageMapper;
 import com.cyksj.model.entity.MidjourneyUser;
 import com.cyksj.model.entity.UpgradePackage;
@@ -53,6 +54,8 @@ public class MidjourneyController {
 
     private final RedisService redisService;
 
+    private final MidjourneyUserConversationMapper midjourneyUserConversationMapper;
+
 
     //-------------------------alpha -----------------------
 
@@ -155,9 +158,8 @@ public class MidjourneyController {
         if (midjourneyUser == null) {
             throw BusinessRuntimeException.getInstance("车票出现了异常.");
         }
-        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap()).field(MidjourneyUserConversationRecordHistoryView::getMjUserToken, midjourneyUser.getUserToken());
-        SearchResult<MidjourneyUserConversationRecordHistoryView> search = beanSearcher.search(MidjourneyUserConversationRecordHistoryView.class, builder.build());
-        return GatewayResponse.SUCCESS.newBuilder().toResult(search);
+        List<MidjourneyUserConversationRecordHistoryView> mjCarHistory = midjourneyUserConversationMapper.getMjCarHistory(midjourneyUser.getUserToken());
+        return GatewayResponse.SUCCESS.newBuilder().toResult(new SearchResult<>(mjCarHistory));
     }
 
 }