From eeb3b5c9c794a35d7b7f3c8e56f9eef8eb8d3451 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 01 Apr 2026 17:20:19 +0800
Subject: [PATCH] opt:兼容人大金仓
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
index 32e1e53..2fdfeb3 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -43,7 +43,7 @@
from
ja_fw_area_divide ad
left join
- ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
ad.is_deleted = 0
<if test="param2.id != null and param2.id != ''">
@@ -99,7 +99,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
<where>
ad.is_deleted = 0
<if test="deptList != null and deptList.size > 0">
@@ -112,7 +112,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -123,7 +123,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -234,7 +234,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
where ad.is_deleted = 0
and ad.id = #{id}
</select>
@@ -264,14 +264,14 @@
(
select group_concat(distinct ds.scene_name)
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
) as scene_name,
(
select group_concat(distinct ds.scene_type)
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
) as scene_type,
@@ -284,7 +284,7 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -294,7 +294,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -304,7 +304,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and ee.counter_effect = '1'
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
@@ -316,7 +316,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(ad.id, ds.area_divide_ids)
)
@@ -398,7 +398,7 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -408,7 +408,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
)
@@ -418,7 +418,7 @@
else (
select count(1)
from ja_fw_effect_eval ee
- join ja_fw_device d on d.id = ee.device_id and d.is_deleted = 0
+ join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
and ee.counter_effect = 'success'
and find_in_set(d.id, replace(ad.device_ids, ' ', ''))
@@ -467,7 +467,7 @@
ps.contact_person as police_station_contact_person,
ps.contact_phone as police_station_contact_phone
from ja_fw_area_divide ad
- left join ja_fw_police_station ps on ps.id = ad.police_station_id and ps.is_deleted = 0
+ left join ja_fw_police_station ps on ps.id = ad.police_station_id::VARCHAR and ps.is_deleted = 0
inner join (
SELECT
d.id
@@ -497,7 +497,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -508,7 +508,7 @@
and exists (
select 1
from ja_fw_defense_scene ds
- join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id and dsm.is_deleted = 0
+ join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
and ds.area_divide_ids is not null
and ds.area_divide_ids != ''
@@ -565,7 +565,7 @@
select
count(1)
from ja_fw_defense_scene_manage dsm
- left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id and ds.is_deleted = 0
+ left join ja_fw_defense_scene ds on ds.id = dsm.defense_scene_id::VARCHAR and ds.is_deleted = 0
where ds.is_deleted = 0
and find_in_set(#{areaId}, ds.area_divide_ids)
and dsm.is_deleted = 0
--
Gitblit v1.9.3