处理Vo继承entity问题

rain

2026-01-21 8d5b8a8c1909be6cdca5228a01bdc017b85a4078

 drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml

@@ -4,11 +4,106 @@

    <!-- 通用查询映射结果 -->
    <resultMap id="fwDroneAlarmRecordResultMap" type="org.sxkj.fw.record.entity.FwDroneAlarmRecordEntity">
        <result column="id" property="id"/>
        <result column="device_id" property="deviceId"/>
        <result column="drone_name" property="droneName"/>
        <result column="drone_serial_no" property="droneSerialNo"/>
        <result column="drone_type" property="droneType"/>
        <result column="alarm_type" property="alarmType"/>
        <result column="alarm_time" property="alarmTime"/>
        <result column="trigger_reason" property="triggerReason"/>
        <result column="flight_status" property="flightStatus"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="signal_freq_mhz" property="signalFreqMhz"/>
        <result column="flight_height_m" property="flightHeightM"/>
        <result column="flight_speed_ms" property="flightSpeedMs"/>
        <result column="stay_duration" property="stayDuration"/>
        <result column="counter_way" property="counterWay"/>
        <result column="area_divide_id" property="areaDivideId"/>
        <result column="defense_scene_id" property="defenseSceneId"/>
        <result column="area_code" property="areaCode"/>
        <result column="create_user" property="createUser"/>
        <result column="create_dept" property="createDept"/>
        <result column="create_time" property="createTime"/>
        <result column="update_user" property="updateUser"/>
        <result column="update_time" property="updateTime"/>
        <result column="status" property="status"/>
        <result column="is_deleted" property="isDeleted"/>
    </resultMap>


    <select id="selectFwDroneAlarmRecordPage" resultMap="fwDroneAlarmRecordResultMap">
        select * from ja_fw_drone_alarm_record where is_deleted = 0
    <select id="selectFwDroneAlarmRecordPage" resultType="org.sxkj.fw.record.vo.FwDroneAlarmRecordVO">
        select
        dar.*,
        d.device_name,
        d.status deviceStatus
        from
        ja_fw_drone_alarm_record dar
        left join ja_fw_device d on dar.device_id = d.id
        <where>
            dar.is_deleted = 0
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and dar.device_id = #{param2.deviceId}
            </if>
            <if test="param2.droneName != null and param2.droneName != ''">
                and dar.drone_name like CONCAT('%', #{param2.droneName}, '%')
            </if>
            <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
                and dar.drone_serial_no = #{param2.droneSerialNo}
            </if>
            <if test="param2.droneType != null and param2.droneType != ''">
                and dar.drone_type = #{param2.droneType}
            </if>
            <if test="param2.alarmType != null and param2.alarmType != ''">
                and dar.alarm_type = #{param2.alarmType}
            </if>
            <if test="param2.alarmTime != null and param2.alarmTime != ''">
                and dar.alarm_time = #{param2.alarmTime}
            </if>
            <if test="param2.triggerReason != null and param2.triggerReason != ''">
                and dar.trigger_reason = #{param2.triggerReason}
            </if>
            <if test="param2.flightStatus != null and param2.flightStatus != ''">
                and dar.flight_status = #{param2.flightStatus}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and dar.longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and dar.latitude = #{param2.latitude}
            </if>
            <if test="param2.signalFreqMhz != null and param2.signalFreqMhz != ''">
                and dar.signal_freq_mhz = #{param2.signalFreqMhz}
            </if>
            <if test="param2.flightHeightM != null and param2.flightHeightM != ''">
                and dar.flight_height_m = #{param2.flightHeightM}
            </if>
            <if test="param2.flightSpeedMs != null and param2.flightSpeedMs != ''">
                and dar.flight_speed_ms = #{param2.flightSpeedMs}
            </if>
            <if test="param2.stayDuration != null and param2.stayDuration != ''">
                and dar.stay_duration = #{param2.stayDuration}
            </if>
            <if test="param2.counterWay != null and param2.counterWay != ''">
                and dar.counter_way = #{param2.counterWay}
            </if>
            <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
                and dar.area_divide_id = #{param2.areaDivideId}
            </if>
            <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
                and dar.defense_scene_id = #{param2.defenseSceneId}
            </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}
            </if>
            <if test="param2.areaName != null and param2.areaName != ''">
                and dar.area_name like CONCAT('%', #{param2.areaName}, '%')
            </if>
        </where>
    </select>


@@ -16,4 +111,11 @@
        SELECT * FROM ja_fw_drone_alarm_record ${ew.customSqlSegment}
    </select>

    <select id="alarmTypeStatistics" resultType="org.sxkj.fw.cockpit.vo.AlarmStatisticsVO">
        SELECT
        COUNT(CASE WHEN alarm_type = 1 THEN 1 END) AS realTimeAlarmCount,
        COUNT(CASE WHEN alarm_type = 2 THEN 2 END) AS historyAlarmCount
        FROM ja_fw_drone_alarm_record WHERE is_deleted = 0
    </select>

</mapper>