吉安感知网项目-后端
linwei
2026-04-07 ceb8e68df3012e9b621219c28fa0f10505313ca4
opt: 人大金仓数据库改造
1 files modified
51 ■■■■ changed files
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml 51 ●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -41,66 +41,67 @@
        d.final_outbound_area,
        /* 1=已关注,0=未关注 */
        EXISTS (
        SELECT
        1
        FROM
        ja_fw_alarm_favorite f
        WHERE
        /* 修改点1:确保 ID 比对类型一致 */
        f.alarm_record_id::VARCHAR = dar.id::VARCHAR
        AND  f.user_id = #{param2.currentUserId}::bigint
        AND  f.is_deleted = 0
        SELECT 1 FROM ja_fw_alarm_favorite f
        WHERE f.alarm_record_id::text = dar.id::text
        AND f.user_id = #{param2.currentUserId}::bigint
        AND f.is_deleted = 0
        ) AS favorited
        from
        ja_fw_drone_alarm_record dar
        left join
        /* 修改点2:JOIN 两端全部转 VARCHAR 避坑 */
        ja_fw_device d on dar.device_id::VARCHAR = d.id::VARCHAR
        ja_fw_device d on dar.device_id::text = d.id::text
        <where>
            dar.is_deleted = 0
            and d.is_enabled = 1
            <if test="param2.regionCode != null and param2.regionCode != ''">
                and (d.final_outbound_area_code like CONCAT(#{param2.regionCode}, '%')
                <if test="param2.currentDeptId != null and param2.currentDeptId != '' ">
                    /* 修改点3:IN 两端必须类型对等 */
                    or dar.device_id::VARCHAR in (
                    SELECT device_id::VARCHAR FROM ja_fw_device_per_share
                    or dar.device_id::text in (
                    SELECT device_id::text FROM ja_fw_device_per_share
                    WHERE loan_to_dept_id = #{param2.currentDeptId}::bigint
                    AND is_deleted = 0
                    )
                </if>
                )
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and dar.device_id::VARCHAR = #{param2.deviceId}::VARCHAR
                and dar.device_id::text = #{param2.deviceId}::text
            </if>
            /* ... 其余 if 条件保持不变 ... */
            <if test="param2.droneName != null and param2.droneName != ''">
            <if test="param2.droneName != null and param2.droneName != '' or (param2.droneSerialNo != null and param2.droneSerialNo != '')">
                and (
                dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
                1=2 <if test="param2.droneName != null and param2.droneName != ''">
                or dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
            </if>
            <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
                or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
                <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
                    or dar.drone_serial_no like CONCAT('%', #{param2.droneSerialNo}, '%')
                </if>
                )
            </if>
            /* ... 注意:如果下面的字段如 area_divide_id 是 bigint,也要像下面这样处理 ... */
            <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
                and dar.area_divide_id::VARCHAR = #{param2.areaDivideId}::VARCHAR
                and dar.area_divide_id::text = #{param2.areaDivideId}::text
            </if>
            <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
                and dar.defense_scene_id::VARCHAR = #{param2.defenseSceneId}::VARCHAR
                and dar.defense_scene_id::text = #{param2.defenseSceneId}::text
            </if>
            <if test="param2.startTime != null and param2.startTime != '' and param2.endTime != null and param2.endTime != ''">
                and dar.alarm_time BETWEEN #{param2.startTime} AND #{param2.endTime}
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and dar.device_type = #{param2.deviceType}
                and dar.device_type::text = #{param2.deviceType}::text
            </if>
            <if test="param2.areaName != null and param2.areaName != ''">
                and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
            </if>
        </where>
                order by favorited desc
        order by favorited desc, dar.alarm_time desc
    </select>