Merge remote-tracking branch 'origin/master'

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java

@@ -19,6 +19,7 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.sample.fegin.RemoteBusinessTaskFeign;
 import org.dromara.sample.media.mapper.IFileMapper;
 import org.dromara.sample.media.model.MediaFileEntity;
 import org.dromara.sample.wayline.mapper.IAiCompareQueueMapper;
@@ -50,8 +51,12 @@ public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
     private final IAiCompareQueueMapper aiCompareQueueMapper;
     private final IWaylineJobMapper waylineJobMapper;
     private final IFileMapper fileMapper;
-    @DubboReference
-    private final RemoteBusinessTaskService remoteBusinessTaskService;
+    //@DubboReference
+    //private final RemoteBusinessTaskService remoteBusinessTaskService;
+
+
+    private final RemoteBusinessTaskFeign remoteBusinessTaskFeign;
+
     @Override
     public TableDataInfo<AiCompareQueueEntity> queueList(AiCompareQueueDTO bo, PageQuery pageQuery) {
         return TableDataInfo.build(aiCompareQueueMapper.selectPage(pageQuery.build(),this.buildAiCompareDTOQueryWrapper(bo)));
@@ -93,7 +98,6 @@ public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
         return aiCompareQueueMapper.updateStatus(ids,queueType);
     }
 
-    @Async
     @Override
     public Boolean addWaylineJobToQueue(String jobId) {
         boolean flag = false;
@@ -110,7 +114,8 @@ public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
             aiCompareQueueEntity.setQueueType(AiCompareStatusConstants.QUEUW_TYPE_0);
             flag= aiCompareQueueMapper.insert(aiCompareQueueEntity)>0;
             //去查询当前的航线是否是预约工单的是就更改完成
-            remoteBusinessTaskService.updateTaskStatus(waylineJob.getFileId(), BusinessConstants.TASK_STATUS_3,null,null);
+            //remoteBusinessTaskService.updateTaskStatus(waylineJob.getFileId(), BusinessConstants.TASK_STATUS_3,null,null);
+            remoteBusinessTaskFeign.updateTaskStatus(waylineJob.getFileId(), BusinessConstants.TASK_STATUS_3, null, null);
         }
         return flag;
     }