Merge remote-tracking branch 'origin/master'

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

@@ -66,7 +66,7 @@ public class UpstreamController {
     @GetMapping("/files")
     public HttpResultResponse<PaginationData<UpstreamMediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
                                                                                  @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
-                                                                                 String workspaceName,
+                                                                                 // String workspaceName,
                                                                                  Long startTime,
                                                                                  Long endTime,
                                                                                  String workspaceId,
@@ -75,7 +75,7 @@ public class UpstreamController {
         log.info("============================>Fetching files list with parameters - page: {}, pageSize: {}, startTime: {}, endTime: {}, workspaceId: {}, deviceSn: {}, pictureType: {}",
                 page, pageSize, startTime, endTime, workspaceId, deviceSn, pictureType);
         PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(
-                workspaceName,
+                null,
                 startTime,
                 endTime,
                 page,

Web/env/.env.development

@@ -2,7 +2,7 @@
 VITE_ENV = 'development'
 
 # Api 地址
-VITE_API_URL = 'http://192.168.3.218:6789'
+VITE_API_URL = 'http://192.168.3.89:6789'
 
 # WebSocket 地址
-VITE_WEBSOCKET_URL = 'ws://192.168.3.218:6789/api/v1/ws'
+VITE_WEBSOCKET_URL = 'ws://192.168.3.89:6789/api/v1/ws'

Web/src/hooks/use-g-map-trajectory.ts

@@ -37,7 +37,7 @@ export function useGMapTrajectory() {
       strokeWeight: 6,//线宽
       strokeStyle: 'solid',
     })
-    const serialList = list.filter((item) => [2, 3].includes(item.type));
+    const serialList = list.filter((item) => item.show_point);
     // 序号
     const text = serialList.map((item, index) => {
       return new AMap.Text({
@@ -83,7 +83,7 @@ export function useGMapTrajectory() {
       });
       distances.push(distanceText);
     }
-    const other=[startMarker, polyline, ...text, ...circles, ...distances];
+    const other = [startMarker, polyline, ...text, ...circles, ...distances];
     root.$map.add(other);
     // 自动缩放地图到合适的视野级别
     root.$map.setFitView(other);