11

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

@@ -326,7 +326,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService {
                             if(httpResultResponse.getCode() == 0){
                                 deviceQrtzFileEntity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_2);
                                 deviceQrtzFileMapper.updateById(deviceQrtzFileEntity);
-                                return;
+                                continue;
                             }
                             deviceQrtzFileEntity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_0);
                             deviceQrtzFileMapper.updateById(deviceQrtzFileEntity);

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

@@ -1,5 +1,6 @@
 package org.dromara.sample.media.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.dromara.common.sdk.cloudapi.media.*;
 import org.dromara.common.sdk.cloudapi.media.api.AbstractMediaService;
 import org.dromara.common.sdk.mqtt.MqttReply;
@@ -15,6 +16,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.model.entity.WaylineFileEntity;
 import org.dromara.sample.wayline.service.IAiCompareQueueService;
 import org.dromara.sample.wayline.service.IWaylineJobService;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -107,6 +109,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
         if (deviceOpt.isEmpty()
                 || (Objects.nonNull(mediaFileCount) && request.getBid().equals(mediaFileCount.getBid())
                 && request.getTid().equals(mediaFileCount.getTid()))) {
+            WaylineFileEntity waylineFileEntity = waylineFileMapper.selectOne(new LambdaQueryWrapper<WaylineFileEntity>().eq(WaylineFileEntity::getWaylineId, deviceQrtzFileEntity.getWaylineId()));
             return new TopicEventsResponse<MqttReply>().setData(MqttReply.success());
         }
 
@@ -168,6 +171,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
 
     private void notifyUploadedCount(MediaFileCountDTO mediaFileCount, TopicEventsRequest<FileUploadCallback> request, String jobId, DeviceDTO dock) {
         // Do not notify when files that do not belong to the route are uploaded.
+        //不通知不属于路由的文件被上传。
         if (Objects.isNull(mediaFileCount)) {
             return;
         }
@@ -176,19 +180,21 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
         mediaFileCount.setUploadedCount(mediaFileCount.getUploadedCount() + 1);
 
         // After all the files of the job are uploaded, delete the media file key.
+        //在上传完作业的所有文件后，删除媒体文件键。
         if (mediaFileCount.getUploadedCount() >= mediaFileCount.getMediaCount()) {
             mediaRedisService.delMediaCount(request.getGateway(), jobId);
 
             // After uploading, delete the key with the highest priority.
+            //上传后，删除优先级最高的键。
             MediaFileCountDTO fileCount = mediaRedisService.getMediaHighestPriority(request.getGateway());
             if (Objects.nonNull(fileCount) && jobId.equals(fileCount.getJobId())) {
                 mediaRedisService.delMediaHighestPriority(request.getGateway());
             }
+            aiCompareQueueService.addWaylineJobToQueue(jobId);
         } 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/WaylineFileServiceImpl.java

@@ -81,6 +81,9 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
                                     wrapper.eq(WaylineFileEntity::getDroneModelKey, type.getType()).or();
                                 }
                         })
+                        .and(param.getDeviceSn() != null, wrapper ->  {
+                            wrapper.eq(WaylineFileEntity::getDeviceSn, param.getDeviceSn()).or();
+                        })
                         .like(Objects.nonNull(param.getKey()), WaylineFileEntity::getName, param.getKey())
                         // There is a risk of SQL injection
                         .last(Objects.nonNull(param.getOrderBy()), " order by " + param.getOrderBy().toString()));