Merge branch 'release/V1.3.2.mx/test' of http://192.168.4.240:3000/LINK/LINK-SERVER into release/V2.0.0/test

src/main/java/com/lqkj/link/module/zone/controller/GeomInfoController.java

@@ -43,6 +43,8 @@ public class GeomInfoController {
         return geomInfoService.findAllByZoneId(zoneId);
     }
 
+
+
     @Operation(
             summary = "5.1.2.33 下载场景信息接口V2",
             description = "5.1.2.33 下载场景信息接口V2",
@@ -112,4 +114,17 @@ public class GeomInfoController {
     public MessageBean<String> uploadVideo(@RequestParam MultipartFile file) {
         return baseService.uploadVideo(file, "zone/video/");
     }
+
+
+    @Operation(
+            summary = "获取导航信息",
+            description = "获取导航信息",
+            parameters = {
+                    @Parameter(name = "zoneId", required = true, description = "作品/区域ID")
+            }
+    )
+    @GetMapping("/getNavigationInfo")
+    public List<GeomInfo> getNavigationInfo(@RequestParam Integer zoneId) {
+        return geomInfoService.getNavigationInfo(zoneId);
+    }
 }

src/main/java/com/lqkj/link/module/zone/repository/GeomInfoRepository.java

@@ -77,4 +77,16 @@ public interface GeomInfoRepository extends JpaRepository<GeomInfo, String> {
     )
     void deleteAllByZoneId(Integer zoneId);
 
+    @Query(nativeQuery = true,
+        value = "SELECT *  " +
+                "FROM geom_info  " +
+                "WHERE zone_id = :zoneId AND navigation = 't' " +
+                "ORDER BY  " +
+                "    CASE  " +
+                "        WHEN geom_name ~ '^[\\u4e00-\\u9fa5]' THEN 0  " +
+                "        ELSE 1  " +
+                "    END, " +
+                "    geom_name;"
+    )
+    List<GeomInfo> getNavigationInfo(Integer zoneId);
 }

src/main/java/com/lqkj/link/module/zone/service/GeomInfoService.java

@@ -78,4 +78,8 @@ public class GeomInfoService {
             layerInfoRepository.deleteAllByIdInBatch(infos.getDeleteLayerList());
         saveGeomByZone(infos);
     }
+
+    public List<GeomInfo> getNavigationInfo(Integer zoneId) {
+        return geomInfoRepository.getNavigationInfo(zoneId);
+    }
 }