kmz配置去除 接口worksapceId查询条件添加

Backend/sample/src/main/java/com/dji/sample/component/oss/model/OssConfiguration.java

@@ -46,8 +46,6 @@ public class OssConfiguration {
 
     public static String objectDirPrefix;
 
-    public static String objectDirKmz;
-
     public void setProvider(OssTypeEnum provider) {
         OssConfiguration.provider = provider;
     }
@@ -96,9 +94,6 @@ public class OssConfiguration {
         OssConfiguration.bucketLogs = bucketLogs;
     }
 
-    public void setObjectDirKmz(String objectDirKmz) {
-        OssConfiguration.objectDirKmz = objectDirKmz;
-    }
 }
 
 

Backend/sample/src/main/java/com/dji/sample/manage/controller/UpstreamController.java

@@ -28,8 +28,6 @@ public class UpstreamController {
     @Autowired
     private IDeviceService deviceService;
 
-    @Autowired
-    private IDevicePayloadService devicePayloadService;
 
     @Autowired
     private IManageDeviceLivestreamUrlService livestreamUrlService;
@@ -37,8 +35,6 @@ public class UpstreamController {
     @Autowired
     private IFileService fileService;
 
-    @Autowired
-    private IMediaDirService dirService;
 
     /**
      * 上游系统获取设备列表信息
@@ -48,8 +44,9 @@ public class UpstreamController {
      */
     @GetMapping("/devicesList")
     public HttpResultResponse<List<UpstreamDeviceDTO>> getDevicesList(String searchInfo,
-                                                                      Integer status) {
-        List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status);
+                                                                      Integer status,
+                                                                      String workspaceId) {
+        List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status,workspaceId);
         return HttpResultResponse.success(devices);
     }
 
@@ -65,8 +62,9 @@ public class UpstreamController {
                                                                                 @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
                                                                                 String workspaceName,
                                                                                 Long startTime,
-                                                                                Long endTime ) {
-        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize);
+                                                                                Long endTime,
+                                                                                 String workspaceId) {
+        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId);
         return HttpResultResponse.success(filesList);
     }
 
@@ -78,8 +76,9 @@ public class UpstreamController {
      */
     @GetMapping("/webRtc")
     public HttpResultResponse<List<UpstreamLivestreamUrlDTO>> getWebRtc(String payload,
-                                                                 String deviceSn) {
-        List<UpstreamLivestreamUrlDTO> url = livestreamUrlService.selWebRtc(payload, deviceSn);
+                                                                    String deviceSn,
+                                                                    String workspaceId) {
+        List<UpstreamLivestreamUrlDTO> url = livestreamUrlService.selWebRtc(payload, deviceSn,workspaceId);
         return HttpResultResponse.success(url);
     }
 
@@ -91,8 +90,9 @@ public class UpstreamController {
      */
     @GetMapping("/devicesDetailList")
     public HttpResultResponse<List<UpstreamDeviceDetailDTO>> getDevicesDetailList(String searchInfo,
-                                                                      Integer status) {
-        List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status);
+                                                                                    Integer status,
+                                                                                  String workspaceId) {
+        List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status,workspaceId);
         return HttpResultResponse.success(devices);
     }
 

Backend/sample/src/main/java/com/dji/sample/manage/dao/IDeviceMapper.java

@@ -29,7 +29,10 @@ public interface IDeviceMapper extends BaseMapper<DeviceEntity> {
             "<if test='workspaceName != null'> " +
             " and worksapce_name LIKE CONCAT('%', #{workspaceName},'%')" +
             " </if> "+
+            "<if test='workspaceId != null'> " +
+            " and md.workspace_id = #{workspaceId} " +
+            " </if> "+
             "</script>")
-    List<UpstreamDeviceDetailDTO> selUpstreamDeviceList(@Param("workspaceName") String workspaceName);
+    List<UpstreamDeviceDetailDTO> selUpstreamDeviceList(@Param("workspaceName") String workspaceName,@Param("workspaceId") String workspaceId);
 
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/IDeviceService.java

@@ -213,7 +213,7 @@ public interface IDeviceService {
 
     void updateHome(DeviceDTO drone, AMap homePoint);
 
-    List<UpstreamDeviceDTO> selUpstreamDeviceList(String searchInfo, Integer status);
+    List<UpstreamDeviceDTO> selUpstreamDeviceList(String searchInfo, Integer status,String workspaceId);
 
-    List<UpstreamDeviceDetailDTO> selUpstreamDeviceDetailList(String searchInfo, Integer status);
+    List<UpstreamDeviceDetailDTO> selUpstreamDeviceDetailList(String searchInfo, Integer status,String workspaceId);
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/IManageDeviceLivestreamUrlService.java

@@ -20,5 +20,5 @@ public interface IManageDeviceLivestreamUrlService {
      * 上游系统获取webRtc地址
      * @return
      */
-    List<UpstreamLivestreamUrlDTO> selWebRtc(String payload, String deviceSn);
+    List<UpstreamLivestreamUrlDTO> selWebRtc(String payload, String deviceSn,String workspaceId);
 }

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/DeviceServiceImpl.java

@@ -785,13 +785,16 @@ public class DeviceServiceImpl implements IDeviceService {
     }
 
     @Override
-    public List<UpstreamDeviceDTO> selUpstreamDeviceList(String searchInfo, Integer status) {
+    public List<UpstreamDeviceDTO> selUpstreamDeviceList(String searchInfo, Integer status,String workspaceId) {
         List<UpstreamDeviceDTO> resultList = new ArrayList<>();
         LambdaQueryWrapper<DeviceEntity> wrapper = new LambdaQueryWrapper<>();
         if(searchInfo != null) {
             wrapper.like( DeviceEntity::getDeviceSn, searchInfo)
                     .or().like( DeviceEntity::getNickname, searchInfo);
         }
+        if(workspaceId != null) {
+            wrapper.eq( DeviceEntity::getWorkspaceId, workspaceId);
+        }
         List<DeviceEntity> list = mapper.selectList(wrapper);
         if(list.size() > 0) {
             for(DeviceEntity device : list) {
@@ -827,13 +830,9 @@ public class DeviceServiceImpl implements IDeviceService {
     }
 
     @Override
-    public List<UpstreamDeviceDetailDTO> selUpstreamDeviceDetailList(String searchInfo, Integer status) {
+    public List<UpstreamDeviceDetailDTO> selUpstreamDeviceDetailList(String searchInfo, Integer status,String workspaceId) {
         List<UpstreamDeviceDetailDTO> resultList = new ArrayList<>();
-        LambdaQueryWrapper<DeviceEntity> wrapper = new LambdaQueryWrapper<>();
-        if(searchInfo != null) {
-            wrapper.like( DeviceEntity::getNickname, searchInfo);
-        }
-        List<UpstreamDeviceDetailDTO> list = mapper.selUpstreamDeviceList(searchInfo);
+        List<UpstreamDeviceDetailDTO> list = mapper.selUpstreamDeviceList(searchInfo,workspaceId);
         if(list.size() > 0) {
             for(UpstreamDeviceDetailDTO device : list) {
                 DeviceDTO deviceDTO = new DeviceDTO();

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/ManageDeviceLivestreamUrlServiceImpl.java

@@ -151,11 +151,12 @@ public class ManageDeviceLivestreamUrlServiceImpl implements IManageDeviceLivest
     }
 
     @Override
-    public List<UpstreamLivestreamUrlDTO> selWebRtc(String payload, String deviceSn) {
+    public List<UpstreamLivestreamUrlDTO> selWebRtc(String payload, String deviceSn,String workspaceId) {
         List<UpstreamLivestreamUrlDTO> resultList = new ArrayList<>();
         LambdaQueryWrapper<ManageDeviceLivestreamUrlEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ManageDeviceLivestreamUrlEntity::getUrlType,LiveUrlTypeEnum.WEBRTC.getVal())
                 .eq(null!= payload,ManageDeviceLivestreamUrlEntity::getPayloadIndex,payload)
+                .eq(null!= workspaceId,ManageDeviceLivestreamUrlEntity::getWorkspaceId,workspaceId)
                 .eq(null!= deviceSn,ManageDeviceLivestreamUrlEntity::getDeviceSn,deviceSn);
         List<ManageDeviceLivestreamUrlEntity> result = mapper.selectList(wrapper);
         if(result.size() > 0 ) {

Backend/sample/src/main/java/com/dji/sample/media/dao/IFileMapper.java

@@ -32,6 +32,9 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "<if test= 'null != workspaceName  '>" +
             "    AND MW.workspace_name LIKE CONCAT('%', #{workspaceName},'%') " +
             "</if>" +
+            "<if test= 'null != workspaceId  '>" +
+            "    AND MW.workspace_id = #{workspaceId}  " +
+            "</if>" +
             "<if test= 'null != startTime'  >" +
             "    AND MF.create_time &gt; #{startTime}  " +
             "</if>" +
@@ -40,7 +43,7 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "</if>" +
             "LIMIT #{page},#{pageSize} " +
             "</script>")
-    List<UpstreamMediaFileDTO> getMediaFiles(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("page") long page,@Param("pageSize") long pageSize);
+    List<UpstreamMediaFileDTO> getMediaFiles(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("page") long page,@Param("pageSize") long pageSize,@Param("workspaceId") String workspaceId);
     @Select("<script> " +
             "SELECT count(*) total " +
             "FROM MEDIA_FILE MF " +
@@ -51,6 +54,9 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "<if test= 'null != workspaceName  '>" +
             "    AND MW.workspace_name LIKE CONCAT('%', #{workspaceName},'%') " +
             "</if>" +
+            "<if test= 'null != workspaceId  '>" +
+            "    AND MW.workspace_id = #{workspaceId}  " +
+            "</if>" +
             "<if test= 'null != startTime'  >" +
             "    AND MF.create_time &gt; #{startTime}  " +
             "</if>" +
@@ -58,6 +64,6 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "    AND MF.create_time &lt; #{endTime}  " +
             "</if>" +
             "</script>")
-    long getMediaFilesCount(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName);
+    long getMediaFilesCount(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("workspaceId") String workspaceId);
 
 }

Backend/sample/src/main/java/com/dji/sample/media/service/IFileService.java

@@ -108,7 +108,7 @@ public interface IFileService {
 
     boolean deleteMediaElement(String workspaceId, MediaFileDTO mediaFileDTO);
 
-    PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize);
+    PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId);
 
     UploadResultDTO uploadFile(MultipartFile file,String creator);
 }

Backend/sample/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java

@@ -850,9 +850,9 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize) {
-        List<UpstreamMediaFileDTO> respData = mapper.getMediaFiles(startTime,endTime,workspaceName, page-1,  pageSize);
-        long total = mapper.getMediaFilesCount(startTime,endTime,workspaceName);
+    public PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId) {
+        List<UpstreamMediaFileDTO> respData = mapper.getMediaFiles(startTime,endTime,workspaceName, page-1,  pageSize,workspaceId);
+        long total = mapper.getMediaFilesCount(startTime,endTime,workspaceName,workspaceId);
         return new PaginationData<UpstreamMediaFileDTO>(respData, new Pagination(page, pageSize, total));
     }
 

Backend/sample/src/main/java/com/dji/sample/wayline/service/impl/WaylineFileServiceImpl.java

@@ -241,7 +241,7 @@ public class WaylineFileServiceImpl implements IWaylineFileService {
                 return Optional.of(WaylineFileDTO.builder()
                         .droneModelKey(DeviceEnum.find(DeviceDomainEnum.DRONE, type, subType).getDevice())
                         .payloadModelKeys(List.of(DeviceEnum.find(DeviceDomainEnum.PAYLOAD, payloadType, payloadSubType).getDevice()))
-                        .objectKey(OssConfiguration.objectDirKmz + File.separator + filename)
+                        .objectKey(OssConfiguration.objectDirPrefix + File.separator + filename)
                         .name(filename.substring(0, filename.lastIndexOf(WAYLINE_FILE_SUFFIX)))
                         .height(height)
                         .heightMode(heightMode)

Backend/sample/src/main/resources/application-prd.yml

@@ -123,7 +123,6 @@ oss:
   expire: 3600
   region: us-east-1
   object-dir-prefix: wayline
-  object-dir-kmz: kmz
 
 logging:
   level:

Backend/sample/src/main/resources/application-test.yml

@@ -123,7 +123,6 @@ oss:
   expire: 3600
   region: us-east-1
   object-dir-prefix: wayline
-  object-dir-kmz: kmz
 
 logging:
   level:

Backend/sample/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   port: 6789
 spring:
   profiles:
-    active: test
+    active: prd
   main:
     allow-bean-definition-overriding: true
   application: