Merge branch 'nf_midjourney_alpha' into dev

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

@@ -50,11 +50,7 @@ public class MidjouneyCarInfoView {
     /**
      * 任务数
      */
-    @TableField(exist = false)
+    @DbField("mj.taskNum")
     private Long taskNum;
 
-    /**
-     * 得分
-     */
-    private Double score;
 }

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

@@ -65,7 +65,7 @@ public class MidjourneyController {
      * @return
      */
     @GetMapping("/mj/cars")
-    public Result<SearchResult<MidjouneyCarInfoView>> getCarInfoList(Long relationId,Boolean taskNumAsc) {
+    public Result<SearchResult<MidjouneyCarInfoView>> getCarInfoList(Long relationId) {
         long userId = StpUserUtil.getLoginIdAsLong();
         //查看用户是否存在车票
         MidjourneyUser midjourneyUser = midjourneyService.getUser(userId, relationId);
@@ -73,14 +73,6 @@ public class MidjourneyController {
             throw BusinessRuntimeException.getInstance("您还未购买车票");
         }
         SearchResult<MidjouneyCarInfoView> carInfoList = beanSearcher.search(MidjouneyCarInfoView.class,MapUtils.flatBuilder(request.getParameterMap()).build());
-        carInfoList.getDataList().forEach(midjouneyCarInfoView -> {
-            midjouneyCarInfoView.setTaskNum(getCarConversationCount(midjouneyCarInfoView.getCarId(), 5L));
-        });
-        if(taskNumAsc){
-            carInfoList.getDataList().sort(Comparator.comparing(MidjouneyCarInfoView::getTaskNum));
-        }else {
-            carInfoList.getDataList().sort(Comparator.comparing(MidjouneyCarInfoView::getTaskNum).reversed());
-        }
         return GatewayResponse.SUCCESS.newBuilder().toResult(carInfoList);
     }
     /**