Merge branch 'nf_midjourney_alpha'

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

@@ -11,7 +11,7 @@ import java.util.Date;
  * @date 2024/4/10 11:37
  */
 @Data
-@SearchBean(tables = "(SELECT MAX(id) id from midjourney_user_conversation_record as r :userToken: " +
+@SearchBean(tables = "(SELECT MAX(id) id from midjourney_user_conversation_record as m" +
         "GROUP BY r.car_id) t left join midjourney_user_conversation_record as r on t.id = r.id"
         ,orderBy = "r.created_time desc"
 )
@@ -19,6 +19,9 @@ public class MidjourneyUserConversationRecordHistoryView {
 
     @DbField("r.user_token")
     private String userToken;
+
+    @DbField("m.user_token")
+    private String mjUserToken;
     /**
      * 提示词
      */

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

@@ -155,7 +155,7 @@ public class MidjourneyController {
         if (midjourneyUser == null) {
             throw BusinessRuntimeException.getInstance("车票出现了异常.");
         }
-        MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap()).put("userToken", String.format(" where r.user_token = %s", midjourneyUser.getUserToken()));
+        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);
     }