Merge branch 'master' of http://106.13.50.125:13000/yuanqiang/dk_cloud_drone

dk-common/common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java

@@ -75,7 +75,9 @@ public class MapstructUtils {
         // 创建一个新的列表，用于保存转换后的对象
         List<V> resultList = new ArrayList<>();
 
-        sourceList.forEach(source -> Convert.convert(desc,source));
+        sourceList.forEach(source -> {
+            resultList.add(Convert.convert(desc,source));
+        });
 
         return resultList;
     }

dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java

@@ -1,5 +1,6 @@
 package org.dromara.sample.manage.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.sdk.cloudapi.device.DeviceDomainEnum;
 import org.dromara.common.sdk.cloudapi.device.DeviceEnum;
 import org.dromara.common.sdk.cloudapi.organization.*;
@@ -102,6 +103,10 @@ public class SDKOrganizationService extends AbstractOrganizationService {
                             CommonErrorEnum.DEVICE_BINDING_FAILED.getCode())
             );
         });
+        if(ObjectUtil.isEmpty(dockOpt.get().getWorkspaceId())){
+            return new TopicRequestsResponse<MqttReply<AirportOrganizationBindResponse>>()
+                .setData(MqttReply.error("不在分区"));
+        }
         boolean success = deviceService.saveOrUpdateDevice(dockOpt.get());
 
         bindResult.add(success ?

dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java

@@ -15,6 +15,7 @@ import org.dromara.sample.media.model.MediaFileDTO;
 import org.dromara.sample.media.service.IFileService;
 import org.dromara.sample.media.service.IMediaRedisService;
 import org.dromara.sample.media.service.IMediaService;
+import org.dromara.sample.wayline.service.IAiCompareQueueService;
 import org.dromara.sample.wayline.service.IWaylineJobService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
@@ -50,7 +51,8 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
     @Autowired
     private IDeviceService deviceService;
 
-
+    @Autowired
+    private IAiCompareQueueService aiCompareQueueService;
     @Autowired
     private IDeviceRedisService deviceRedisService;
 
@@ -185,7 +187,8 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
         } else {
             mediaRedisService.setMediaCount(request.getGateway(), jobId, mediaFileCount);
         }
-
+        //11
+        aiCompareQueueService.addWaylineJobToQueue(jobId);
         webSocketMessageService.sendBatch(dock.getWorkspaceId(), UserTypeEnum.WEB.getVal(),
                 BizCodeEnum.FILE_UPLOAD_CALLBACK.getCode(), mediaFileCount);
     }

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

@@ -29,6 +29,7 @@ import org.dromara.sample.wayline.model.entity.AiCompareEntity;
 import org.dromara.sample.wayline.model.entity.AiCompareQueueEntity;
 import org.dromara.sample.wayline.model.entity.WaylineJobEntity;
 import org.dromara.sample.wayline.service.IAiCompareQueueService;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -92,6 +93,7 @@ public class AiCompareQueueServiceImpl implements IAiCompareQueueService {
         return aiCompareQueueMapper.updateStatus(ids,queueType);
     }
 
+    @Async
     @Override
     public Boolean addWaylineJobToQueue(String jobId) {
         boolean flag = false;