sql修改，配置修改

src/main/resources/application.yml

@@ -16,13 +16,14 @@ spring:
         max-active: 20
         validation-query: SELECT 1
         test-while-idle: true
-        time-between-eviction-runs-millis: 30000
-        min-evictable-idle-time-millis: 60000
+        time-between-eviction-runs-millis: 60000
+        min-evictable-idle-time-millis: 1800000
         filters: stat,wall
         connection-properties: druid.mysql.usePingMethod=false
         stat-view-servlet:
           enabled: true
           url-pattern: /druid/*
+        socket-timeout: 60000
     # redis ??
     redis:
       database: 0

src/main/resources/mapper/ShoreLinePointsSpaceMapper.xml

@@ -21,37 +21,21 @@
     </select>
 
     <select id="analysisHkPoint" resultType="com.shcd.boat.entity.HkShoreLine">
-
-                    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 DISTINCT ON (shore.id)
+                            hk.id,
+                            shore.id AS shoreLineId,
+                            ROUND(ST_Distance(
+                            ST_Transform(hk.point_geom, 4326)::geography,
+                            ST_Transform(shore.line_geom, 4326)::geography
+                            )::numeric, 2) 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
+                            )
+                        ORDER BY shore.id, distance
 
     </select>
 </mapper>