fix

midjourney/src/main/java/com/yhlxj/service/midjourney/impl/MidjourneyServiceImpl.java

@@ -1057,10 +1057,10 @@ public class MidjourneyServiceImpl implements MidjourneyService {
     @Override
     public void syscConversation() throws Exception {
         List<MidjourneyUserConversation> fastMidjourneyUserConversations = conversationMapper.selectList(Wrappers.lambdaQuery(MidjourneyUserConversation.class)
-                .notIn(MidjourneyUserConversation::getStatus, List.of("SUCCESS","FAILURE")).eq(MidjourneyUserConversation::getMode,1).orderByAsc(MidjourneyUserConversation::getId).last("limit 50"));
+                .notIn(MidjourneyUserConversation::getStatus, List.of("SUCCESS","MODAL","FAILURE")).eq(MidjourneyUserConversation::getMode,1).orderByAsc(MidjourneyUserConversation::getId).last("limit 50"));
 
         List<MidjourneyUserConversation> relaxMidjourneyUserConversations = conversationMapper.selectList(Wrappers.lambdaQuery(MidjourneyUserConversation.class)
-                .notIn(MidjourneyUserConversation::getStatus, List.of("SUCCESS","FAILURE")).eq(MidjourneyUserConversation::getMode,2).orderByAsc(MidjourneyUserConversation::getId).last("limit 50"));
+                .notIn(MidjourneyUserConversation::getStatus, List.of("SUCCESS","MODAL","FAILURE")).eq(MidjourneyUserConversation::getMode,2).orderByAsc(MidjourneyUserConversation::getId).last("limit 50"));
 
         Map<Long, List<MidjourneyUserConversation>> fastCollect = fastMidjourneyUserConversations.stream().collect(Collectors.groupingBy(MidjourneyUserConversation::getApiChannelId));
 

midjourney/src/main/java/com/yhlxj/web/mirror/MidjourneyController.java

@@ -9,7 +9,9 @@ import com.cyksj.common.util.IoKit;
 import com.cyksj.dto.Result;
 import com.cyksj.enums.GatewayResponse;
 import com.ejlchina.searcher.BeanSearcher;
+import com.ejlchina.searcher.FieldOp;
 import com.ejlchina.searcher.SearchResult;
+import com.ejlchina.searcher.param.Operator;
 import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import com.yhlxj.dao.mapper.GroupsRelationMapper;
@@ -372,6 +374,7 @@ public class MidjourneyController {
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
         return GatewayResponse.SUCCESS.newBuilder().toResult(beanSearcher.search(MidjourneyUserConversation.class,
                 builder.field(MidjourneyUserConversation::getUserId, user.getId())
+                        .field(MidjourneyUserConversation::getStatus,"MODAL").op(Operator.NotEqual)
                         .selectExclude(MidjourneyUserConversation::getChannelId,MidjourneyUserConversation::getInstanceId)
                         .orderBy(MidjourneyUserConversation::getId).desc().build()));
     }