diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java
index b100045..84dbc89 100644
--- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java
+++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/media/api/IHttpMediaService.java
@@ -70,9 +70,10 @@ public interface IHttpMediaService {
                             value = "{\"code\": 0, \"message\":\"success\", \"data\": \"media/DJI_20220831151616_0004_W_Waypoint4.JPG\"}"
                     )})))
 
-    @PostMapping(PREFIX + "/workspaces/{workspace_id}/upload-callback")
+    @PostMapping(PREFIX + "/workspaces/{workspace_id}/{pro_id}/upload-callback")
     HttpResultResponse<String> mediaUploadCallback(
             @PathVariable(name = "workspace_id") String workspaceId,
+            @PathVariable(name = "pro_id") Integer proId,
             @Valid @RequestBody MediaUploadCallbackRequest request,
                 HttpServletRequest req, HttpServletResponse rsp);
 
diff --git a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java
index d826853..202bd4f 100644
--- a/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java
+++ b/dk-common/common-cloudsdk/src/main/java/org/dromara/common/sdk/cloudapi/wayline/api/IHttpWaylineService.java
@@ -48,6 +48,7 @@ public interface IHttpWaylineService {
     HttpResultResponse<PaginationData<GetWaylineListResponse>> getWaylineList(
         @Valid @ParameterObject GetWaylineListRequest request,
         @PathVariable(name = "workspace_id") String workspaceId,
+        @PathVariable(name = "proIds") List<Integer> proIds,
         HttpServletRequest req, HttpServletResponse rsp);
 
     /**
diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java
index be9c2c6..f86da09 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertStatisticsController.java
@@ -198,6 +198,7 @@ public class BusinessAlertStatisticsController extends BaseController {
     @Operation(summary="预警对比统计(预警状态)", description="预警对比统计(预警状态)")
     @GetMapping(value = "/compare/status/count")
     public R<List<Map<String, Object>>> countAlertStatusCompare(BusinessAlertBo businessAlertBo) {
+
         return R.ok(statisticsService.countAlertStatusCompare(businessAlertBo));
     }
 
diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
index 6afe490..2057c46 100644
--- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
+++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java
@@ -307,6 +307,24 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
         return TableDataInfo.build(page);
     }
 
+    /**
+     * 查询当前用户待办预警
+     * @return
+     */
+    @Override
+    public List<BusinessAlert> listTodoAlert(BusinessAlertBo businessAlertBo) {
+        QueryWrapper<BusinessAlert> wrapper = buildQueryWrapper(businessAlertBo);
+
+        if (ObjectUtil.isEmpty(wrapper)){
+            return ListUtil.empty();
+        }
+
+        wrapper.eq("t.node_type", 1);
+        wrapper.in("t.approver", remoteWorkflowService.getPermissions());
+        wrapper.in("t.flow_status", BusinessStatusEnum.WAITING.getStatus());
+
+        return this.baseMapper.listTodoAlert(wrapper);
+    }
 
     /**
      * 查询当前用户待办预警
diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
index d044dc9..cfc68e9 100644
--- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
+++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml
@@ -109,6 +109,42 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ${ew.getCustomSqlSegment}
     </select>
 
+    <select id="listTodoAlert" resultType="org.dromara.business.domain.BusinessAlert">
+        select t.* from (
+                            select
+                                ba.*,
+                                b.flow_status,
+                                b.business_id,
+                                uu.processed_by approver,
+                                a.id flowTaskId,
+                                b.id instanceId,
+                                a.node_type,
+                                fnData.buttonPermission,
+                                fnData.permissions
+                            from dk_business.business_alert ba
+                                     inner join dk_workflow.flow_instance b on ba.id = b.business_id
+                                     left join dk_workflow.flow_task a on a.instance_id = b.id
+                                     left join dk_workflow.flow_user uu on uu.associated = a.id
+                                     left join dk_workflow.flow_definition c on a.definition_id = c.id
+                                     LEFT JOIN LATERAL (
+                                SELECT
+                                    JSON_UNQUOTE(JSON_EXTRACT(fn.ext, '$[0].value')) AS buttonPermission,
+                                    fn.permissions
+                                FROM dk_workflow.flow_node fn
+                                WHERE
+                                    fn.node_code = b.node_code
+                                  and fn.definition_id = c.id
+                                  and fn.del_flag = '0'
+                                    LIMIT 1
+                        ) AS fnData ON TRUE
+        where a.node_type = 1
+          and a.del_flag = '0'
+          and uu.del_flag = '0'
+          and uu.type in ('1','2','3')
+            ) t
+            ${ew.getCustomSqlSegment}
+    </select>
+
     <select id="listMonthAlert" resultType="java.util.Map">
         SELECT DATE_FORMAT(DATE_ADD(CURDATE(), INTERVAL -11 MONTH), '%Y-%m') AS dateMonth,count(1) total from business_alert ba
          where DATE_FORMAT(ba.create_time, '%Y-%m' ) = DATE_FORMAT(DATE_ADD(DATE_FORMAT(CURDATE(), '%Y-01-01'), INTERVAL 0 MONTH), '%Y-%m')
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java
index 139af62..15fd4c6 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceController.java
@@ -9,6 +9,7 @@ import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.sample.manage.model.dto.DeviceDTO;
 import org.dromara.sample.manage.model.dto.DeviceFirmwareUpgradeDTO;
+import org.dromara.sample.manage.service.IDeviceProService;
 import org.dromara.sample.manage.service.IDeviceService;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +38,10 @@ public class DeviceController {
     @Autowired
     private IDeviceService deviceService;
 
+
+    @Autowired
+    private IDeviceProService deviceProService;
+
     /**
      * 获取一个工作区中所有在线设备的列表。
      * Get the topology list of all online devices in one workspace.
@@ -45,8 +50,8 @@ public class DeviceController {
     @GetMapping("/{workspace_id}/devices")
     @Operation(summary = "获取一个工作区中所有在线设备的列表。", description = "获取一个工作区中所有在线设备的列表")
     public HttpResultResponse<List<DeviceDTO>> getDevices(@PathVariable("workspace_id") String workspaceId,
-                                                          @RequestParam(name = "nickname",required = false) String nickname) {
-        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId,nickname);
+                                                          @RequestParam(name = "nickname",required = false) String nickname,@RequestParam(name = "proIds",required = false) List<Integer> proIds) {
+        List<DeviceDTO> devicesList = deviceService.getDevicesTopoForWeb(workspaceId,nickname,proIds);
         return HttpResultResponse.success(devicesList);
     }
 
@@ -92,9 +97,9 @@ public class DeviceController {
             @PathVariable("workspace_id") String workspaceId,Integer domain,
             @RequestParam(name = "pageNum", defaultValue = "1") Long page,
             @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize,
-            @RequestParam(name = "nickname",required = false) String nickname) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        PaginationData<DeviceDTO> devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain,nickname);
+            @RequestParam(name = "nickname",required = false) String nickname,
+            @RequestParam(name = "proIds",required = false) List<Integer> proIds) {
+        PaginationData<DeviceDTO> devices = deviceService.getBoundDevicesWithDomain(workspaceId, page, pageSize, domain,nickname,proIds);
 
         return HttpResultResponse.success(devices);
     }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java
index 6e2fcca..2bbfb94 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceDTO.java
@@ -102,7 +102,7 @@ public class DeviceDTO {
     private String tenantId;
 
     @Schema(description = "项目ID")
-    private String proId;
+    private Integer proId;
 
     @Schema(description = "项目ID")
     private DeviceProEntity deviceProEntity;
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java
index 8b7f833..0f061cb 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/dto/DeviceQrtzDTO.java
@@ -96,4 +96,6 @@ public class DeviceQrtzDTO {
     private String deptName;
 
     private List<Long>deptIds;
+
+    private List<Integer> proIds;
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java
index 301b75c..55368e4 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/param/DeviceQueryParam.java
@@ -35,4 +35,6 @@ public class DeviceQueryParam {
     private boolean orderBy;
 
     private boolean isAsc;
+
+    private List<Integer> proIds;
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java
index 0e046a6..93ce040 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceService.java
@@ -66,7 +66,7 @@ public interface IDeviceService {
      * @param workspaceId
      * @return
      */
-    List<DeviceDTO> getDevicesTopoForWeb(String workspaceId,String nickname);
+    List<DeviceDTO> getDevicesTopoForWeb(String workspaceId,String nickname,List<Integer> proIds);
 
 
     /**
@@ -129,7 +129,7 @@ public interface IDeviceService {
      * @param domain
      * @return
      */
-    PaginationData<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain,String nickname);
+    PaginationData<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page, Long pageSize, Integer domain,String nickname,List<Integer> proIds);
 
     /**
      * Unbind device base on device's sn.
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
index aee999d..c305431 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceServiceImpl.java
@@ -221,21 +221,24 @@ public class DeviceServiceImpl implements IDeviceService {
                             }
                         })
                         .eq(StringUtils.hasText(param.getWorkspaceId()),
-                                DeviceEntity::getWorkspaceId, param.getWorkspaceId())
+                            DeviceEntity::getWorkspaceId, param.getWorkspaceId())
                         .eq(param.getBoundStatus() != null, DeviceEntity::getBoundStatus, param.getBoundStatus())
+                        .in(ObjectUtil.isAllNotEmpty(param.getProIds()),
+                            DeviceEntity::getDeviceSn, param.getProIds())
                         .orderBy(param.isOrderBy(),
-                                param.isAsc(), DeviceEntity::getId))
+                            param.isAsc(), DeviceEntity::getId))
                 .stream()
                 .map(this::deviceEntityConvertToDTO)
                 .collect(Collectors.toList());
     }
 
     @Override
-    public List<DeviceDTO> getDevicesTopoForWeb(String workspaceId,String nickname) {
+    public List<DeviceDTO> getDevicesTopoForWeb(String workspaceId,String nickname,List<Integer> proIds) {
         List<DeviceDTO> devicesList = this.getDevicesByParams(
                 DeviceQueryParam.builder()
                         .workspaceId(workspaceId)
                         .domains(List.of(DeviceDomainEnum.REMOTER_CONTROL.getDomain(), DeviceDomainEnum.DOCK.getDomain()))
+                         .proIds(proIds)
                         .build());
 
         devicesList.stream()
@@ -405,7 +408,7 @@ public class DeviceServiceImpl implements IDeviceService {
                                     .map(WorkspaceDTO::getWorkspaceName).orElse("") : "")
                     .firmwareStatus(DeviceFirmwareStatusEnum.NOT_UPGRADE)
                     .videoId(dockVideoId)
-                    .thingVersion(entity.getVersion()).proId(ObjectUtil.isNotEmpty(entity.getProId())?String.valueOf(entity.getProId()):"").build();
+                    .thingVersion(entity.getVersion()).build();
         } catch (CloudSDKException e) {
             log.error(e.getLocalizedMessage() + "Entity: {}", entity);
         }
@@ -495,13 +498,14 @@ public class DeviceServiceImpl implements IDeviceService {
 
     @Override
     public PaginationData<DeviceDTO> getBoundDevicesWithDomain(String workspaceId, Long page,
-                                                               Long pageSize, Integer domain,String nickname) {
+                                                               Long pageSize, Integer domain,String nickname,List<Integer> proIds) {
 
         Page<DeviceEntity> pagination = mapper.selectPage(new Page<>(page, pageSize),
                 new LambdaQueryWrapper<DeviceEntity>()
                         .eq(DeviceEntity::getDomain, domain)
                         .eq(DeviceEntity::getWorkspaceId, workspaceId)
                         .eq(DeviceEntity::getBoundStatus, true)
+                        .in(ObjectUtil.isAllNotEmpty(proIds),DeviceEntity::getProId, proIds)
                         .eq(org.dromara.common.core.utils.StringUtils.isNotEmpty(nickname),DeviceEntity::getNickname,nickname));
         List<DeviceDTO> devicesList = pagination.getRecords().stream().map(this::deviceEntityConvertToDTO)
                 .peek(device -> {
@@ -710,7 +714,8 @@ public class DeviceServiceImpl implements IDeviceService {
                 .firmwareVersion(dto.getFirmwareVersion())
                 .compatibleStatus(dto.getFirmwareStatus() == null ? null :
                         DeviceFirmwareStatusEnum.CONSISTENT_UPGRADE != dto.getFirmwareStatus())
-                .deviceDesc(dto.getDeviceDesc()).proId(ObjectUtil.isNotEmpty(dto.getProId())?Integer.valueOf(dto.getProId()):null)
+                .deviceDesc(dto.getDeviceDesc())
+                .proId(dto.getProId() == null ? null : dto.getProId())
                 .build();
     }
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java
index 87c84bb..07163ac 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/SDKDeviceService.java
@@ -2,6 +2,7 @@ package org.dromara.sample.manage.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import org.dromara.common.redis.utils.RedisOpsUtils;
+import org.dromara.common.redis.utils.RedisUtils;
 import org.dromara.common.sdk.cloudapi.device.*;
 import org.dromara.common.sdk.cloudapi.device.api.AbstractDeviceService;
 import org.dromara.common.sdk.cloudapi.psdk.PsdkUiResource;
@@ -30,12 +31,15 @@ import org.springframework.util.StringUtils;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 
+import static org.dromara.common.core.constant.Constants.FLY_COUNT;
+
 /**
  * @author sean
  * @version 1.7
@@ -156,6 +160,13 @@ public class SDKDeviceService extends AbstractDeviceService {
         }
 
         DeviceDTO device = deviceOpt.get();
+        if(request.getData().getLatitude() != null && request.getData().getLongitude() != null
+            && ((deviceOpt.get().getLatitude() == null && deviceOpt.get().getLongitude() == null)) || (request.getData().getLatitude() != deviceOpt.get().getLatitude() && request.getData().getLongitude() != deviceOpt.get().getLongitude())){
+            deviceOpt.get().setLatitude(request.getData().getLatitude());
+            deviceOpt.get().setLongitude(request.getData().getLongitude());
+            deviceRedisService.setDeviceOnline(deviceOpt.get());
+            deviceService.updateDevice(deviceOpt.get());
+        }
         if (StringUtils.hasText(device.getChildDeviceSn())) {
             deviceService.getDeviceBySn(device.getChildDeviceSn()).ifPresent(device::setChildren);
         }
@@ -165,13 +176,13 @@ public class SDKDeviceService extends AbstractDeviceService {
             && request.getData().getDroneChargeState().getCapacityPercent() >= 80 && (remainUpload != null && remainUpload == 0)){
                 deviceQrtzService.getDeviceQrtzFileEntity(device);
         }
-
         deviceRedisService.setDeviceOnline(device);
         fillDockOsd(from, request.getData());
 
         deviceService.pushOsdDataToWeb(device.getWorkspaceId(), BizCodeEnum.DOCK_OSD, from, request.getData());
     }
 
+
     @Override
     public void osdDockDrone(TopicOsdRequest<OsdDockDrone> request, MessageHeaders headers) {
         String from = request.getFrom();
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java
index d53add4..40f0fb4 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/FileController.java
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.io.IOException;
 import java.net.URL;
+import java.util.List;
 
 /**
  * @author sean
@@ -37,8 +38,9 @@ public class FileController {
     @Operation(summary = "根据工作区id获取此工作区中所有媒体文件的信息。", description = "根据工作区id获取此工作区中所有媒体文件的信息。")
     public HttpResultResponse<PaginationData<MediaFileDTO>> getFilesList(@RequestParam(name = "pageNum", defaultValue = "1") Long page,
                                                                          @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize,
-                                                                         @PathVariable(name = "workspace_id") String workspaceId) {
-        PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize);
+                                                                         @PathVariable(name = "workspace_id") String workspaceId,
+                                                                         @RequestParam(name = "pro_ids",required = false) List<Integer> proIds) {
+        PaginationData<MediaFileDTO> filesList = fileService.getMediaFilesPaginationByWorkspaceId(workspaceId, page, pageSize,proIds);
         return HttpResultResponse.success(filesList);
     }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java
index 2fe3bc4..69dabb9 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/controller/MediaController.java
@@ -52,8 +52,8 @@ public class MediaController implements IHttpMediaService {
      * @return
      */
     @Override
-    public HttpResultResponse<String> mediaUploadCallback(  String workspaceId, @Valid MediaUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) {
-        mediaService.saveMediaFile(workspaceId, request);
+    public HttpResultResponse<String> mediaUploadCallback(  String workspaceId,Integer proId, @Valid MediaUploadCallbackRequest request, HttpServletRequest req, HttpServletResponse rsp) {
+        mediaService.saveMediaFile(workspaceId, request,proId);
         return HttpResultResponse.success(request.getObjectKey());
     }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java
index ac9b1b0..7d53fc8 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/model/MediaFileEntity.java
@@ -111,5 +111,8 @@ public class MediaFileEntity implements Serializable {
 
     @TableField("file_index")
     private Integer fileIndex;
+
+    @TableField("pro_id")
+    private Integer proId;
 }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java
index 62adab9..e3edb3a 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IFileService.java
@@ -29,7 +29,7 @@ public interface IFileService {
      * @param file
      * @return
      */
-    Integer saveFile(String workspaceId, MediaUploadCallbackRequest file, FlightTask flightTask);
+    Integer saveFile(String workspaceId, MediaUploadCallbackRequest file, FlightTask flightTask,Integer proId);
 
     /**
      * Query information about all files in this workspace based on the workspace id.
@@ -45,7 +45,7 @@ public interface IFileService {
      * @param pageSize
      * @return
      */
-    PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize);
+    PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize,List<Integer> proIds);
 
     /**
      * Get the download address of the file.
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java
index 141039d..51940dc 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/IMediaService.java
@@ -26,7 +26,7 @@ public interface IMediaService {
      * @param file
      * @return
      */
-    Integer saveMediaFile(String workspaceId, MediaUploadCallbackRequest file);
+    Integer saveMediaFile(String workspaceId, MediaUploadCallbackRequest file,Integer proId);
 
     /**
      * Query tiny fingerprints about all files in this workspace based on the workspace id.
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
index 4b20be7..ca5f149 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/FileServiceImpl.java
@@ -1,6 +1,7 @@
 package org.dromara.sample.media.service.impl;
 
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -65,10 +66,11 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public Integer saveFile(String workspaceId, MediaUploadCallbackRequest file, FlightTask flightTask) {
+    public Integer saveFile(String workspaceId, MediaUploadCallbackRequest file, FlightTask flightTask,Integer proId) {
         MediaFileEntity fileEntity = this.fileUploadConvertToEntity(file,flightTask);
         fileEntity.setWorkspaceId(workspaceId);
         fileEntity.setFileId(UUID.randomUUID().toString());
+        fileEntity.setProId(proId);
         fileEntity.setFileType(fileEntity.getFileName().substring( fileEntity.getFileName().lastIndexOf(".")+1));
         if(!fileEntity.getFileType().equals("DAT")){
             fileEntity.setFileStatus(fileEntity.getFileName().substring( fileEntity.getFileName().lastIndexOf("_")+1, fileEntity.getFileName().lastIndexOf(".")));
@@ -91,11 +93,12 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize) {
+    public PaginationData<MediaFileDTO> getMediaFilesPaginationByWorkspaceId(String workspaceId, long page, long pageSize,List<Integer> proIds) {
         Page<MediaFileEntity> pageData = mapper.selectPage(
                 new Page<MediaFileEntity>(page, pageSize),
                 new LambdaQueryWrapper<MediaFileEntity>()
                         .eq(MediaFileEntity::getWorkspaceId, workspaceId)
+                        .in(ObjectUtil.isAllNotEmpty(proIds),MediaFileEntity::getProId, proIds)
                         .orderByDesc(MediaFileEntity::getId));
         List<MediaFileDTO> records = pageData.getRecords()
                 .stream()
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 f6bcd97..366e7d7 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
@@ -79,8 +79,8 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
     }
 
     @Override
-    public Integer saveMediaFile(String workspaceId, MediaUploadCallbackRequest file) {
-        return fileService.saveFile(workspaceId, file,null);
+    public Integer saveMediaFile(String workspaceId, MediaUploadCallbackRequest file,Integer proId) {
+        return fileService.saveFile(workspaceId, file,null,proId);
     }
 
     @Override
@@ -180,7 +180,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ
         file.setPath(objectKey.substring(Optional.of(objectKey.indexOf("mediafile"))
                 .filter(index -> index > 0).map(index -> index++).orElse(0),
                 objectKey.lastIndexOf("/")));
-        Integer fileFlag = fileService.saveFile(device.getWorkspaceId(), file, callback.getFlightTask());
+        Integer fileFlag = fileService.saveFile(device.getWorkspaceId(), file, callback.getFlightTask(),device.getProId());
 
         return fileFlag> 0;
     }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java
index fe5cd46..7330e19 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineFileController.java
@@ -1,6 +1,7 @@
 package org.dromara.sample.wayline.controller;
 
 
+import io.seata.common.util.CollectionUtils;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -14,6 +15,8 @@ import org.dromara.common.sdk.cloudapi.wayline.*;
 import org.dromara.common.sdk.cloudapi.wayline.api.IHttpWaylineService;
 import org.dromara.common.sdk.common.HttpResultResponse;
 import org.dromara.common.sdk.common.PaginationData;
+import org.dromara.sample.manage.mapper.IDeviceProUserMapper;
+import org.dromara.sample.manage.service.IDeviceProService;
 import org.dromara.sample.wayline.model.dto.WaylineFileDTO;
 import org.dromara.sample.wayline.model.entity.AudioFileEntity;
 import org.dromara.sample.wayline.model.entity.WaylineFileEntity;
@@ -46,6 +49,9 @@ public class WaylineFileController implements IHttpWaylineService {
     @Autowired
     private IWaylineFileService waylineFileService;
 
+    @Autowired
+    private IDeviceProService deviceProService;
+
     /**
      * 根据waylineID删除工作区中的wayline文件。
      * Delete the wayline file in the workspace according to the wayline id.
@@ -67,13 +73,13 @@ public class WaylineFileController implements IHttpWaylineService {
      */
     @PostMapping("${url.wayline.prefix}${url.wayline.version}/workspaces/{workspace_id}/waylines/file/{deviceSn}/upload")
     @Operation(summary = "导入kmz航路文件。", description = "导入kmz航路文件。")
-    public HttpResultResponse importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,HttpServletRequest request, MultipartFile file,@PathVariable(name = "deviceSn") String deviceSn) {
+    public HttpResultResponse importKmzFile(@PathVariable(name = "workspace_id") String workspaceId,HttpServletRequest request, MultipartFile file,@PathVariable(name = "deviceSn") String deviceSn,@PathVariable(name = "proId") Integer proId) {
         if (Objects.isNull(file)) {
             return HttpResultResponse.error("未收到文件。");
         }
         LoginUser loginUser = LoginHelper.getLoginUser();
         String creator = loginUser.getUsername();
-        waylineFileService.importKmzFile(file, workspaceId, creator,deviceSn);
+        waylineFileService.importKmzFile(file, workspaceId, creator,deviceSn,proId);
         return HttpResultResponse.success();
     }
 
@@ -86,8 +92,8 @@ public class WaylineFileController implements IHttpWaylineService {
      * @return
      */
     @Override
-    public HttpResultResponse<PaginationData<GetWaylineListResponse>> getWaylineList(@Valid GetWaylineListRequest request,String workspaceId,  HttpServletRequest req, HttpServletResponse rsp) {
-        PaginationData<GetWaylineListResponse> data = waylineFileService.getWaylinesByParam(workspaceId, request);
+    public HttpResultResponse<PaginationData<GetWaylineListResponse>> getWaylineList(@Valid GetWaylineListRequest request,String workspaceId,List<Integer> proIds, HttpServletRequest req, HttpServletResponse rsp) {
+        PaginationData<GetWaylineListResponse> data = waylineFileService.getWaylinesByParam(workspaceId, request,proIds);
         return HttpResultResponse.success(data);
     }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java
index c7df333..0944787 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/WaylineJobController.java
@@ -24,6 +24,8 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
 
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.name;
+
 
 /**
  * @author sean
@@ -67,8 +69,10 @@ public class WaylineJobController {
     @Operation(summary = "查询工作区中的所有作业。。", description = "查询工作区中的所有作业。")
     public HttpResultResponse<PaginationData<WaylineJobDTO>> getJobs(@RequestParam(name = "pageNum", defaultValue = "1") Long page,
                                                                      @RequestParam(name = "pageSize", defaultValue = "10") Long pageSize,
-                                                                     @PathVariable(name = "workspace_id") String workspaceId) {
-        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize);
+                                                                     @PathVariable(name = "workspace_id") String workspaceId,
+                                                                     @RequestParam(name = "proId") List<Integer> proIds,
+                                                                     @RequestParam(name = "name") String name) {
+        PaginationData<WaylineJobDTO> data = waylineJobService.getJobsByWorkspaceId(workspaceId, page, pageSize,proIds,name);
         return HttpResultResponse.success(data);
     }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java
index 828b018..580dab9 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineFileDTO.java
@@ -47,4 +47,6 @@ public class WaylineFileDTO {
 
     private Integer fileNo;
 
+    private Integer proId;
+
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java
index 9973b5a..62e97e5 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/WaylineJobDTO.java
@@ -10,6 +10,7 @@ import org.dromara.common.sdk.cloudapi.wayline.TaskTypeEnum;
 import org.dromara.common.sdk.cloudapi.wayline.WaylineTypeEnum;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @author sean
@@ -72,4 +73,6 @@ public class WaylineJobDTO {
     private String parentId;
 
     private ProgressExtBreakPoint breakPoint;
+
+    private List<Integer> proIds;
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java
index 32ac78d..c92be00 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineFileEntity.java
@@ -69,4 +69,6 @@ public class WaylineFileEntity implements Serializable {
     @TableField(exist = false)
     private String deviceName;
 
+    @TableField("pro_id")
+    private Integer proId;
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java
index 315eb97..853646f 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/entity/WaylineJobEntity.java
@@ -94,4 +94,7 @@ public class WaylineJobEntity implements Serializable {
 
     @TableField(exist = false)
     private ProgressExtBreakPoint breakPoint;
+
+    @TableField("pro_id")
+    private Integer proId;
 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java
index 13e4e30..5c491c2 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineFileService.java
@@ -26,7 +26,7 @@ public interface IWaylineFileService {
      * @param param
      * @return
      */
-    PaginationData<GetWaylineListResponse> getWaylinesByParam(String workspaceId, GetWaylineListRequest param);
+    PaginationData<GetWaylineListResponse> getWaylinesByParam(String workspaceId, GetWaylineListRequest param,List<Integer> proIds);
 
     /**
      * Query the information of this wayline file according to the wayline file id.
@@ -83,7 +83,7 @@ public interface IWaylineFileService {
      * @param creator
      * @return
      */
-    void importKmzFile(MultipartFile file, String workspaceId, String creator,String deviceSn);
+    void importKmzFile(MultipartFile file, String workspaceId, String creator,String deviceSn,Integer proId);
 
     String getWaylineIdByFileId(Integer fileId);
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java
index a0c6492..3eb9066 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IWaylineJobService.java
@@ -28,7 +28,7 @@ public interface IWaylineJobService {
      * @param endTime       The time the job ended.
      * @return
      */
-    Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Date beginTime, Date endTime);
+    Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Date beginTime, Date endTime, Integer proId);
 
     /**
      * Create a sub-task based on the information of the parent task.
@@ -69,7 +69,7 @@ public interface IWaylineJobService {
      * @param pageSize
      * @return
      */
-    PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize);
+    PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize,List<Integer> proIds,String name);
 
     /**
      * Query the wayline execution status of the dock.
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java
index e3011e4..745b2e4 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -241,8 +241,14 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
                 if (TaskTypeEnum.IMMEDIATE != param.getTaskType() && endTime < System.currentTimeMillis()) {
                     continue;
                 }
-
-                Optional<WaylineJobDTO> waylineJobOpt = waylineJobService.createWaylineJob(param, workspaceId, loginUser.getUsername(), new Date(beginTime), new Date(endTime));
+                Optional<DeviceDTO> deviceOnline = deviceRedisService.getDeviceOnline(param.getDockSn());
+                if(deviceOnline.isEmpty()){
+                    throw new SQLException("机场信息不存在");
+                }
+                if(deviceOnline.get().getProId() == null){
+                    throw new SQLException("项目组不存在");
+                }
+                Optional<WaylineJobDTO> waylineJobOpt = waylineJobService.createWaylineJob(param, workspaceId, loginUser.getUsername(), new Date(beginTime), new Date(endTime),deviceOnline.get().getProId());
                 if (waylineJobOpt.isEmpty()) {
                     throw new SQLException("无法创建路线作业。");
                 }
@@ -273,8 +279,14 @@ public class FlightTaskServiceImpl extends AbstractWaylineService implements IFl
                 if (TaskTypeEnum.IMMEDIATE != param.getTaskType() && endTime < System.currentTimeMillis()) {
                     continue;
                 }
-
-                Optional<WaylineJobDTO> waylineJobOpt = waylineJobService.createWaylineJob(param, workspaceId, username, new Date(beginTime), new Date(endTime));
+                Optional<DeviceDTO> deviceOnline = deviceRedisService.getDeviceOnline(param.getDockSn());
+                if(deviceOnline.isEmpty()){
+                    throw new SQLException("机场信息不存在");
+                }
+                if(deviceOnline.get().getProId() == null){
+                    throw new SQLException("项目组不存在");
+                }
+                Optional<WaylineJobDTO> waylineJobOpt = waylineJobService.createWaylineJob(param, workspaceId, username, new Date(beginTime), new Date(endTime),deviceOnline.get().getProId());
                 if (waylineJobOpt.isEmpty()) {
                     throw new SQLException("无法创建路线作业。");
                 }
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java
index ddbe4f4..4e18381 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/SDKWaylineService.java
@@ -3,6 +3,7 @@ package org.dromara.sample.wayline.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.dromara.common.core.constant.DeviceQrtzConstants;
+import org.dromara.common.sdk.cloudapi.device.OsdDockDrone;
 import org.dromara.common.sdk.cloudapi.wayline.*;
 import org.dromara.common.sdk.cloudapi.wayline.api.AbstractWaylineService;
 import org.dromara.common.sdk.mqtt.MqttReply;
@@ -16,8 +17,10 @@ import org.dromara.sample.common.error.CommonErrorEnum;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
 import org.dromara.sample.manage.mapper.IDeviceQrtzFileMapper;
 import org.dromara.sample.manage.model.dto.DeviceDTO;
+import org.dromara.sample.manage.model.entity.DeviceFlightRecordsEntity;
 import org.dromara.sample.manage.model.entity.DeviceQrtzFileEntity;
 import org.dromara.sample.manage.model.enums.UserTypeEnum;
+import org.dromara.sample.manage.service.IDeviceFlightRecordsService;
 import org.dromara.sample.manage.service.IDeviceRedisService;
 import org.dromara.sample.media.model.MediaFileCountDTO;
 import org.dromara.sample.media.service.IMediaRedisService;
@@ -71,6 +74,9 @@ public class SDKWaylineService extends AbstractWaylineService {
     @Autowired
     private IWebSocketMessageService webSocketMessageService;
 
+    @Autowired
+    private IDeviceFlightRecordsService deviceFlightRecordsService;
+
     @Override
     public TopicEventsResponse<MqttReply> deviceExitHomingNotify(TopicEventsRequest<DeviceExitHomingNotify> request, MessageHeaders headers) {
         return super.deviceExitHomingNotify(request, headers);
@@ -105,7 +111,14 @@ public class SDKWaylineService extends AbstractWaylineService {
                     .completedTime(LocalDateTime.now())
                     .mediaCount(output.getExt().getMediaCount())
                     .build();
-
+            Optional<OsdDockDrone> deviceOsd = deviceRedisService.getDeviceOsd(deviceOpt.get().getChildDeviceSn(), OsdDockDrone.class);
+            Integer totalFlightSorties = deviceOsd.get().getTotalFlightSorties();
+            Float totalFlightTime = deviceOsd.get().getTotalFlightTime();
+            DeviceFlightRecordsEntity deviceFlightRecords = new DeviceFlightRecordsEntity();
+            deviceFlightRecords.setDeviceSn(response.getGateway());
+            deviceFlightRecords.setFlyCount(totalFlightSorties);
+            deviceFlightRecords.setFlyAccTime(totalFlightTime.intValue());
+            deviceFlightRecordsService.saveDeviceFlight(deviceFlightRecords);
             // record the update of the media count.
             if (Objects.nonNull(job.getMediaCount()) && job.getMediaCount() != 0) {
                 mediaRedisService.setMediaCount(response.getGateway(), job.getJobId(),
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
index 3cfea66..cdb0df0 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineFileServiceImpl.java
@@ -78,7 +78,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
     private RemoteFileService remoteFileService;
 
     @Override
-    public PaginationData<GetWaylineListResponse> getWaylinesByParam(String workspaceId, GetWaylineListRequest param) {
+    public PaginationData<GetWaylineListResponse> getWaylinesByParam(String workspaceId, GetWaylineListRequest param,List<Integer> proIds) {
         // Paging Query
         Page<WaylineFileEntity> page = mapper.selectPage(
                 new Page<WaylineFileEntity>(param.getPage(), param.getPageSize()),
@@ -103,6 +103,9 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
                         .and(ObjectUtil.isNotEmpty(param.getDeviceSn()), wrapper ->  {
                             wrapper.eq(WaylineFileEntity::getDeviceSn, param.getDeviceSn()).or();
                         })
+                        .and(ObjectUtil.isAllNotEmpty(proIds), wrapper ->  {
+                            wrapper.in(WaylineFileEntity::getProId, proIds).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()));
@@ -203,7 +206,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
     }
 
     @Override
-    public void importKmzFile(MultipartFile file, String workspaceId, String creator,String deviceSn) {
+    public void importKmzFile(MultipartFile file, String workspaceId, String creator,String deviceSn,Integer proId) {
         Optional<WaylineFileDTO> waylineFileOpt = validKmzFile(file);
         if (waylineFileOpt.isEmpty()) {
             throw new RuntimeException("文件格式不正确。");
@@ -230,6 +233,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
             }else {
                 waylineFile.setFileNo(1);
             }
+            waylineFile.setProId(proId);
             this.saveWaylineFile(workspaceId, waylineFile);
         } catch (IOException e) {
             e.printStackTrace();
@@ -466,6 +470,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
                     .favorited(file.getFavorited())
                     .sign(file.getSign())
                     .deviceSn(file.getDeviceSns().get(0))
+                    .proId(file.getProId())
                     .build();
         }
 
diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
index 23d1c98..29a1fdc 100644
--- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -1,5 +1,6 @@
 package org.dromara.sample.wayline.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -12,6 +13,7 @@ import org.dromara.common.sdk.cloudapi.device.OsdDockDrone;
 import org.dromara.common.sdk.cloudapi.wayline.*;
 import org.dromara.common.sdk.common.Pagination;
 import org.dromara.common.sdk.common.PaginationData;
+import org.dromara.common.sdk.exception.CloudSDKException;
 import org.dromara.sample.component.mqtt.model.EventsReceiver;
 import org.dromara.sample.manage.model.dto.DeviceDTO;
 import org.dromara.sample.manage.service.IDeviceRedisService;
@@ -35,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.sql.SQLException;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -81,7 +84,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
     }
 
     @Override
-    public Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Date beginTime, Date endTime) {
+    public Optional<WaylineJobDTO> createWaylineJob(CreateJobParam param, String workspaceId, String username, Date beginTime, Date endTime,Integer proId) {
         if (Objects.isNull(param)) {
             return Optional.empty();
         }
@@ -103,6 +106,7 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
                 .rthAltitude(param.getRthAltitude())
                 .mediaCount(0)
                 .breakPoint(param.getBreakPoint())
+                .proId(proId)
                 .build();
 
         return insertWaylineJob(jobEntity);
@@ -154,11 +158,13 @@ public class WaylineJobServiceImpl implements IWaylineJobService {
     }
 
     @Override
-    public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize) {
+    public PaginationData<WaylineJobDTO> getJobsByWorkspaceId(String workspaceId, long page, long pageSize,List<Integer> proIds,String name) {
         Page<WaylineJobEntity> pageData = mapper.selectPage(
                 new Page<WaylineJobEntity>(page, pageSize),
                 new LambdaQueryWrapper<WaylineJobEntity>()
                         .eq(WaylineJobEntity::getWorkspaceId, workspaceId)
+                        .like(WaylineJobEntity::getName, name).or().like(WaylineJobEntity::getWaylineName,name)
+                        .in(ObjectUtil.isAllNotEmpty(proIds),WaylineJobEntity::getProId,proIds)
                         .orderByDesc(WaylineJobEntity::getId));
         List<WaylineJobDTO> records = pageData.getRecords()
                 .stream()
diff --git a/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml b/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml
index 1a4f704..188fc45 100644
--- a/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml
+++ b/dk-modules/sample/src/main/resources/mapper/DeviceQrtzMapper.xml
@@ -43,6 +43,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{id}
             </foreach>
         </if>
+        <if test="condition.proIds.size > 0">
+            AND wd.pro_id in
+            <foreach item="proId" collection="condition.proIds"  open="(" separator="," close=")">
+                #{proId}
+            </foreach>
+        </if>
         order by wdq.status asc, wdq.create_time desc
     </select>
     <select id="calendarList" resultType="java.util.Map"></select>