From 8ac34cbae4ea8cc47194f51389a4e2dddebcc7d5 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 02 Apr 2026 13:55:20 +0800
Subject: [PATCH] opt: sql改造其他模块改造7
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml | 14 +++++++-------
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 8 ++++----
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml | 2 +-
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java | 5 +++++
drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml | 4 ++--
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml | 2 +-
6 files changed, 20 insertions(+), 15 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 4950426..979404b 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
@@ -262,7 +262,7 @@
ad.area_name,
ad.area_type_keys,
(
- select string_agg(distinct ds.scene_name)
+ select string_agg(distinct ds.scene_name, ',')
from ja_fw_defense_scene ds
join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
@@ -282,9 +282,9 @@
else (
select count(1)
from ja_fw_drone_alarm_record ar
- join ja_fw_device d on d.id = ar.device_id::VARCHAR and d.is_deleted = 0
+ join ja_fw_device d on d.id::VARCHAR = ar.device_id::VARCHAR and d.is_deleted = 0
where ar.is_deleted = 0
- and d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as alarm_count,
case
@@ -294,7 +294,7 @@
from ja_fw_effect_eval ee
join ja_fw_device d on d.id = ee.device_id::VARCHAR and d.is_deleted = 0
where ee.is_deleted = 0
- and d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as counter_count,
case
@@ -305,7 +305,7 @@
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 d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
end as counter_success_count
from ja_fw_area_divide ad
@@ -316,7 +316,7 @@
from ja_fw_defense_scene ds
join ja_fw_defense_scene_manage dsm on dsm.defense_scene_id::VARCHAR = ds.id::VARCHAR and dsm.is_deleted = 0
where ds.is_deleted = 0
- and d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
)
<if test="param2.id != null and param2.id != ''">
and ad.id = #{param2.id}
@@ -329,7 +329,7 @@
select 1
from ja_fw_defense_scene ds
where ds.is_deleted = 0
- and d.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
+ and ad.id::VARCHAR = ANY(string_to_array(ad.device_ids, ','))
and ds.scene_type = #{param2.sceneType}
)
</if>
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 22b85a9..9d15deb 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -65,16 +65,16 @@
from
ja_fw_task_schedule ts
left join
- ja_fw_device d on d.id = ts.device_id::VARCHAR
+ ja_fw_device d on d.id::VARCHAR = ts.device_id::VARCHAR
left join
- ja_fw_area_divide ad on ad.id = ts.area_divide_id::VARCHAR
+ ja_fw_area_divide ad on ad.id::VARCHAR = ts.area_divide_id::VARCHAR
left join
- ja_fw_defense_scene_manage dsm on dsm.id = ts.defense_scene_id::VARCHAR
+ ja_fw_defense_scene_manage dsm on dsm.id::VARCHAR = ts.defense_scene_id::VARCHAR
left join
ja_fw_defense_zone dz on dz.is_deleted = 0
and dz.defense_scene_ids is not null
and dz.defense_scene_ids != ''
- and dsm.id = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ',')::bigint[])
+ and dsm.id::VARCHAR = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ','))
<where>
ts.is_deleted = 0
<if test="param2.deviceName != null and param2.deviceName != ''">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
index a6b4cda..4528f78 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -59,7 +59,7 @@
from
ja_fw_device_maintain_plan a
left join
- ja_fw_device b on (a.device_id = b.id::VARCHAR)
+ ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
index 93dc678..a5725c7 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -56,7 +56,7 @@
<include refid="deviceFields"/>,a.*
from
ja_fw_device_scrap a
- left join ja_fw_device b on (a.device_id = b.id::VARCHAR)
+ left join ja_fw_device b on (a.device_id::VARCHAR = b.id::VARCHAR)
<where>
a.is_deleted = 0
<if test="param2.deviceId != null and param2.deviceId != ''">
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
index d45c158..e445978 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/service/impl/FwDroneAlarmRecordServiceImpl.java
@@ -16,6 +16,7 @@
*/
package org.sxkj.fw.record.service.impl;
+import lombok.extern.slf4j.Slf4j;
import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.cockpit.vo.AlarmStatisticsVO;
@@ -45,6 +46,7 @@
* @since 2026-01-08
*/
@Service
+@Slf4j
public class FwDroneAlarmRecordServiceImpl extends BaseServiceImpl<FwDroneAlarmRecordMapper, FwDroneAlarmRecordEntity> implements IFwDroneAlarmRecordService {
@Autowired
@@ -54,9 +56,12 @@
public IPage<FwDroneAlarmRecordVO> selectFwDroneAlarmRecordPage(IPage<FwDroneAlarmRecordVO> page, FwDroneAlarmRecordDTO fwDroneAlarmRecord) {
// 设置当前用户ID
fwDroneAlarmRecord.setCurrentUserId(AuthUtil.getUserId());
+ log.info("查询参数：{}", fwDroneAlarmRecord);
Dept dept = SysCache.getDept(Long.valueOf(AuthUtil.getDeptId()));
+ log.info("部门信息:{}", dept);
// 3. 查询不在这些部门区域内的设备
Region byCode = RegionCache.getByCode(dept.getAreaCode());
+ log.info("部门区域信息:{}", byCode);
fwDroneAlarmRecord.setRegionName(byCode.getName());
fwDroneAlarmRecord.setCurrentDeptId(AuthUtil.getDeptId());
fwDroneAlarmRecord.setRegionCode(HeaderUtils.formatAreaCode(byCode.getCode()));
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
index 7e56b28..12b7415 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/mapper/UserMapper.xml
@@ -32,10 +32,10 @@
<select id="selectUserPage" resultMap="userResultMap">
SELECT
u.*,
- string_agg(r.id) AS roleId
+ string_agg(r.id::varchar, ',') AS roleId
FROM blade_user u
INNER JOIN blade_role r
- ON r.id = ANY(string_to_array(u.role_id, ',')::bigint[])
+ ON r.id::varchar = ANY(string_to_array(u.role_id, ','))
AND r.is_deleted = 0
WHERE u.is_deleted = 0
and u.id != 1123598821738675201
--
Gitblit v1.9.3