From 58a6b4c4129e17057436b3e73a2cb3ddef0ba99d Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Tue, 1 Apr 2025 15:04:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=EF=BC=9A=E5=BC=82?= =?UTF-8?q?=E6=AD=A5=E8=B0=83=E7=94=A8=20=20=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/media/service/impl/MediaServiceImpl.java | 7 +++++-- .../wayline/service/impl/AiCompareQueueServiceImpl.java | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java index 2b25936..d2f3bc2 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java +++ b/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); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java index c1286ec..db23fc6 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareQueueServiceImpl.java +++ b/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; From 61ac343f2ca24d36f3dd22b261baf244be372afe Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 1 Apr 2025 15:07:20 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/sample/component/GlobalScheduleService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java index bb00778..00026f3 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/component/GlobalScheduleService.java @@ -42,7 +42,6 @@ public class GlobalScheduleService { @Scheduled(initialDelay = 10, fixedRate = 30, timeUnit = TimeUnit.SECONDS) private void deviceStatusListen() { int start = RedisConst.DEVICE_ONLINE_PREFIX.length(); - redisOpsUtils.getAllKeys(RedisConst.DEVICE_ONLINE_PREFIX + "*").forEach(key -> { long expire = redisOpsUtils.getExpire(key); if (expire <= 30) { @@ -50,6 +49,9 @@ public class GlobalScheduleService { if (null == device) { return; } + if(device.getWorkspaceId().isEmpty()){ + return; + } if (DeviceDomainEnum.DRONE == device.getDomain()) { deviceService.subDeviceOffline(key.substring(start)); } else { From fe28f31bb75089c5c503aef9d47885534d63462a Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 1 Apr 2025 16:47:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/common/core/utils/MapstructUtils.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dk-common/common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java b/dk-common/common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java index 8046c36..3cac523 100644 --- a/dk-common/common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java +++ b/dk-common/common-core/src/main/java/org/dromara/common/core/utils/MapstructUtils.java @@ -75,7 +75,9 @@ public class MapstructUtils { // 创建一个新的列表，用于保存转换后的对象 List resultList = new ArrayList<>(); - sourceList.forEach(source -> Convert.convert(desc,source)); + sourceList.forEach(source -> { + resultList.add(Convert.convert(desc,source)); + }); return resultList; } From 3c766bec63507a767bea2a601fa19667dc8a43cc Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 1 Apr 2025 17:44:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=9B=B8=E5=85=B3=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/SDKOrganizationService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java index 940804d..51c33dc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKOrganizationService.java +++ b/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>() + .setData(MqttReply.error("不在分区")); + } boolean success = deviceService.saveOrUpdateDevice(dockOpt.get()); bindResult.add(success ?