From edabc68484fb80cf69a0313cbfb851b7baf47a9b Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 07 Apr 2026 18:39:06 +0800
Subject: [PATCH] opt: 人大金仓数据库改造
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index b25fda5..bda4677 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -242,9 +242,9 @@
and (
<foreach collection="query.polygons" item="polygon" separator=" OR ">
ST_Contains(
- ST_SRID(ST_GeometryFromText(#{polygon}), 4326),
+ ST_SRID(ST_GeomFromText(#{polygon}), 4326),
/* 注意：Kingbase/PostGIS 坐标顺序通常是 (经度, 纬度) 即 (longitude, latitude) */
- ST_GeometryFromText(CONCAT('POINT(', longitude, ' ', latitude, ')'), 4326)
+ ST_GeomFromText(CONCAT('POINT(', longitude, ' ', latitude, ')'), 4326)
)
</foreach>
)
@@ -753,7 +753,7 @@
END AS isShared
FROM
ja_fw_device d
- LEFT JOIN ja_fw_device_per_share ps ON ps.device_id = d.id::VARCHAR
+ LEFT JOIN ja_fw_device_per_share ps ON ps.device_id::VARCHAR = d.id::VARCHAR
AND ps.loan_to_dept_id = #{currentDeptId}
AND ps.is_deleted = 0
WHERE
--
Gitblit v1.9.3