|
|
|
@ -57,11 +57,11 @@ |
|
|
|
<if test="address != null">#{address},</if> |
|
|
|
|
|
|
|
<if test="gdLocationPoint != null"> |
|
|
|
ST_GeomFromWKB(#{gdLocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326), |
|
|
|
ST_GeomFromWKB(#{gdLocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326, 'axis-order=long-lat'), |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="wgs84LocationPoint != null"> |
|
|
|
ST_GeomFromWKB(#{wgs84LocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326), |
|
|
|
ST_GeomFromWKB(#{wgs84LocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326, 'axis-order=long-lat'), |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="wgs84Geohash != null">#{wgs84Geohash},</if> |
|
|
|
@ -100,12 +100,12 @@ |
|
|
|
|
|
|
|
<if test="gdLocationPoint != null"> |
|
|
|
gd_location_point = |
|
|
|
ST_GeomFromWKB(#{gdLocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326), |
|
|
|
ST_GeomFromWKB(#{gdLocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326, 'axis-order=long-lat'), |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="wgs84LocationPoint != null"> |
|
|
|
wgs84_location_point = |
|
|
|
ST_GeomFromWKB(#{wgs84LocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326), |
|
|
|
ST_GeomFromWKB(#{wgs84LocationPoint, typeHandler=com.youlai.boot.common.handler.PointTypeHandler}, 4326, 'axis-order=long-lat'), |
|
|
|
</if> |
|
|
|
|
|
|
|
<if test="wgs84Geohash != null">wgs84_geohash = #{wgs84Geohash},</if> |
|
|
|
@ -250,8 +250,8 @@ |
|
|
|
a.province, |
|
|
|
a.city, |
|
|
|
a.district, |
|
|
|
ST_X(a.gd_location_point) AS lng, |
|
|
|
ST_Y(a.gd_location_point) AS lat, |
|
|
|
ST_Longitude(a.gd_location_point) AS lng, |
|
|
|
ST_Latitude(a.gd_location_point) AS lat, |
|
|
|
a.address |
|
|
|
FROM |
|
|
|
mini_stray_animal a |
|
|
|
@ -267,8 +267,8 @@ |
|
|
|
animal_type, |
|
|
|
color, |
|
|
|
size, |
|
|
|
ST_X(gd_location_point) AS lng, |
|
|
|
ST_Y(gd_location_point) AS lat |
|
|
|
ST_Longitude(gd_location_point) AS lng, |
|
|
|
ST_Latitude(gd_location_point) AS lat |
|
|
|
FROM |
|
|
|
mini_stray_animal |
|
|
|
WHERE is_deleted = 0 |
|
|
|
|