sql修改

src/main/java/com/shcd/boat/entity/HkShoreLine.java

@@ -13,7 +13,7 @@ public class HkShoreLine {
     //视频点位空间id
     private String id;
     //岸线id
-    private String shoreLineId;
+    private String shorelineid;
     //船舶与岸线的距离
     private double distance;
 }

src/main/java/com/shcd/boat/service/impl/ShorePowerServiceImpl.java

@@ -150,7 +150,7 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                         if (j.getDistance() <= 15 && i.getDistance() > 15 && i.getShoreLineId().equals(j.getShoreLineId()) && i.getMmsi().equals(j.getMmsi())) {
                             //说明该船已经驶出岸线范围，截图抓拍，并查询最早刚驶入范围的开始时间，然后查询岸电数据
                             //todo:调用海康视频流，进行抓拍
-                            List<String> xyIds = hkShoreLineList.stream().filter(hk -> i.getShoreLineId().equals(hk.getShoreLineId())).map(HkShoreLine::getId).collect(Collectors.toList());
+                            List<String> xyIds = hkShoreLineList.stream().filter(hk -> i.getShoreLineId().equals(hk.getShorelineid())).map(HkShoreLine::getId).collect(Collectors.toList());
                             List<SurveillancePointinfo> surveillancePointinfoList = null;
                             if (!CollectionUtils.isEmpty(xyIds)){
                                 surveillancePointinfoList = surveillancePointinfoService.getSurveillancePointinfoByXyids(xyIds);
@@ -204,7 +204,7 @@ public class ShorePowerServiceImpl implements ShorePowerService {
                         } else {
                             //说明该船还在岸线范围，保存该数据
                             //todo:调用海康视频流，进行抓拍
-                            List<String> xyIds = hkShoreLineList.stream().filter(hk -> j.getShoreLineId().equals(hk.getShoreLineId())).map(HkShoreLine::getId).collect(Collectors.toList());
+                            List<String> xyIds = hkShoreLineList.stream().filter(hk -> j.getShoreLineId().equals(hk.getShorelineid())).map(HkShoreLine::getId).collect(Collectors.toList());
                             List<SurveillancePointinfo> surveillancePointinfoList = null;
                             if (!CollectionUtils.isEmpty(xyIds)){
                                 surveillancePointinfoList = surveillancePointinfoService.getSurveillancePointinfoByXyids(xyIds);

src/main/resources/mapper/ShoreLinePointsSpaceMapper.xml

@@ -21,16 +21,37 @@
     </select>
 
     <select id="analysisHkPoint" resultType="com.shcd.boat.entity.HkShoreLine">
-        SELECT DISTINCT ON (shore_line_points_space.id)
-            haikang_space.id,
-            shore_line_points_space.id AS shoreLineId,
-            ROUND(ST_Distance(
-            ST_Transform(haikang_space.point_geom, 4326)::geography,
-            ST_Transform(shore_line_points_space.line_geom, 4326)::geography
-            )::numeric, 2) AS distance
-        FROM pdhw_space.haikang_space
-            CROSS JOIN pdhw_space.shore_line_points_space
-        ORDER BY shore_line_points_space.id, distance;
+--         SELECT DISTINCT ON (shore_line_points_space.id)
+--             haikang_space.id,
+--             shore_line_points_space.id AS shoreLineId,
+--             ROUND(ST_Distance(
+--             ST_Transform(haikang_space.point_geom, 4326)::geography,
+--             ST_Transform(shore_line_points_space.line_geom, 4326)::geography
+--             )::numeric, 2) AS distance
+--         FROM pdhw_space.haikang_space
+--             CROSS JOIN pdhw_space.shore_line_points_space
+--         ORDER BY shore_line_points_space.id, distance;
+
+                    WITH candidates AS (SELECT hk.id    AS id,
+                           shore.id AS shoreLineId,
+                           ST_Distance(
+                                   ST_Transform(hk.point_geom, 4326)::geography,
+                                   ST_Transform(shore.line_geom, 4326)::geography
+                           )        AS distance
+                    FROM pdhw_space.haikang_space hk
+                             JOIN pdhw_space.shore_line_points_space shore
+                                  ON ST_DWithin(
+                                          ST_Transform(hk.point_geom, 4326)::geography,
+                                          ST_Transform(shore.line_geom, 4326)::geography,
+                                          1000
+                                     ))
+                    SELECT DISTINCT
+                    ON (shoreLineId)
+                        id,
+                        shoreLineId,
+                        ROUND(distance:: numeric, 2) AS distance
+                    FROM candidates
+                    ORDER BY shoreLineId, distance
 
     </select>
 </mapper>