吉安感知网项目-后端
rain
2026-01-08 2fe120e61a586d403b8722d7f6960c58adff1085
xml分页sql增加动态条件
14 files modified
787 ■■■■■ changed files
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml 74 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml 62 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml 50 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.xml 50 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml 44 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml 77 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml 65 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml 41 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml 53 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml 50 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml 44 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml 83 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordDetailMapper.xml 44 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml 50 ●●●●● patch | view | raw | blame | history
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwAreaDivideMapper.xml
@@ -31,7 +31,79 @@
    <select id="selectFwAreaDividePage" resultMap="fwAreaDivideResultMap">
        select * from ja_fw_area_divide where is_deleted = 0
        select * from ja_fw_area_divide
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.areaName != null and param2.areaName != ''">
                and area_name = #{param2.areaName}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.areaSize != null and param2.areaSize != ''">
                and area_size = #{param2.areaSize}
            </if>
            <if test="param2.geom != null and param2.geom != ''">
                and geom = #{param2.geom}
            </if>
            <if test="param2.areaType != null and param2.areaType != ''">
                and area_type = #{param2.areaType}
            </if>
            <if test="param2.triggerCondition != null and param2.triggerCondition != ''">
                and trigger_condition = #{param2.triggerCondition}
            </if>
            <if test="param2.responseMechanism != null and param2.responseMechanism != ''">
                and response_mechanism = #{param2.responseMechanism}
            </if>
            <if test="param2.controlLevel != null and param2.controlLevel != ''">
                and control_level = #{param2.controlLevel}
            </if>
            <if test="param2.policeStationId != null and param2.policeStationId != ''">
                and police_station_id = #{param2.policeStationId}
            </if>
            <if test="param2.flyTimeStart != null and param2.flyTimeStart != ''">
                and fly_time_start = #{param2.flyTimeStart}
            </if>
            <if test="param2.flyTimeEnd != null and param2.flyTimeEnd != ''">
                and fly_time_end = #{param2.flyTimeEnd}
            </if>
            <if test="param2.flyDateStart != null and param2.flyDateStart != ''">
                and fly_date_start = #{param2.flyDateStart}
            </if>
            <if test="param2.flyDateEnd != null and param2.flyDateEnd != ''">
                and fly_date_end = #{param2.flyDateEnd}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseSceneMapper.xml
@@ -27,7 +27,67 @@
    <select id="selectFwDefenseScenePage" resultMap="fwDefenseSceneResultMap">
        select * from ja_fw_defense_scene where is_deleted = 0
        select * from ja_fw_defense_scene
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.sceneName != null and param2.sceneName != ''">
                and scene_name = #{param2.sceneName}
            </if>
            <if test="param2.sceneType != null and param2.sceneType != ''">
                and scene_type = #{param2.sceneType}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.defenseLeader != null and param2.defenseLeader != ''">
                and defense_leader = #{param2.defenseLeader}
            </if>
            <if test="param2.leaderPhone != null and param2.leaderPhone != ''">
                and leader_phone = #{param2.leaderPhone}
            </if>
            <if test="param2.defenseArea != null and param2.defenseArea != ''">
                and defense_area = #{param2.defenseArea}
            </if>
            <if test="param2.deviceMode != null and param2.deviceMode != ''">
                and device_mode = #{param2.deviceMode}
            </if>
            <if test="param2.areaDivideIds != null and param2.areaDivideIds != ''">
                and area_divide_ids = #{param2.areaDivideIds}
            </if>
            <if test="param2.deviceIds != null and param2.deviceIds != ''">
                and device_ids = #{param2.deviceIds}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwDefenseZoneMapper.xml
@@ -23,7 +23,55 @@
    <select id="selectFwDefenseZonePage" resultMap="fwDefenseZoneResultMap">
        select * from ja_fw_defense_zone where is_deleted = 0
        select * from ja_fw_defense_zone
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.zoneName != null and param2.zoneName != ''">
                and zone_name = #{param2.zoneName}
            </if>
            <if test="param2.zoneArea != null and param2.zoneArea != ''">
                and zone_area = #{param2.zoneArea}
            </if>
            <if test="param2.defenseSceneIds != null and param2.defenseSceneIds != ''">
                and defense_scene_ids = #{param2.defenseSceneIds}
            </if>
            <if test="param2.areaDivideIds != null and param2.areaDivideIds != ''">
                and area_divide_ids = #{param2.areaDivideIds}
            </if>
            <if test="param2.deviceIds != null and param2.deviceIds != ''">
                and device_ids = #{param2.deviceIds}
            </if>
            <if test="param2.geom != null and param2.geom != ''">
                and geom = #{param2.geom}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/mapper/FwPoliceStationMapper.xml
@@ -23,7 +23,55 @@
    <select id="selectFwPoliceStationPage" resultMap="fwPoliceStationResultMap">
        select * from ja_fw_police_station where is_deleted = 0
        select * from ja_fw_police_station
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.stationName != null and param2.stationName != ''">
                and station_name = #{param2.stationName}
            </if>
            <if test="param2.address != null and param2.address != ''">
                and address = #{param2.address}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.contactPerson != null and param2.contactPerson != ''">
                and contact_person = #{param2.contactPerson}
            </if>
            <if test="param2.contactPhone != null and param2.contactPhone != ''">
                and contact_phone = #{param2.contactPhone}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
@@ -21,7 +21,49 @@
    <select id="selectFwDeviceConfigPage" resultMap="fwDeviceConfigResultMap">
        select * from ja_fw_device_config where is_deleted = 0
        select * from ja_fw_device_config
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.configVersion != null and param2.configVersion != ''">
                and config_version = #{param2.configVersion}
            </if>
            <if test="param2.isLatest != null and param2.isLatest != ''">
                and is_latest = #{param2.isLatest}
            </if>
            <if test="param2.configJson != null and param2.configJson != ''">
                and config_json = #{param2.configJson}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwEffectEvalMapper.xml
@@ -32,7 +32,82 @@
    <select id="selectFwEffectEvalPage" resultMap="fwEffectEvalResultMap">
        select * from ja_fw_effect_eval where is_deleted = 0
        select * from ja_fw_effect_eval
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.alarmRecordId != null and param2.alarmRecordId != ''">
                and alarm_record_id = #{param2.alarmRecordId}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.deviceCode != null and param2.deviceCode != ''">
                and device_code = #{param2.deviceCode}
            </if>
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and device_name = #{param2.deviceName}
            </if>
            <if test="param2.deviceModel != null and param2.deviceModel != ''">
                and device_model = #{param2.deviceModel}
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and device_type = #{param2.deviceType}
            </if>
            <if test="param2.droneName != null and param2.droneName != ''">
                and drone_name = #{param2.droneName}
            </if>
            <if test="param2.droneType != null and param2.droneType != ''">
                and drone_type = #{param2.droneType}
            </if>
            <if test="param2.droneDeviceCode != null and param2.droneDeviceCode != ''">
                and drone_device_code = #{param2.droneDeviceCode}
            </if>
            <if test="param2.findTime != null and param2.findTime != ''">
                and find_time = #{param2.findTime}
            </if>
            <if test="param2.counterEffect != null and param2.counterEffect != ''">
                and counter_effect = #{param2.counterEffect}
            </if>
            <if test="param2.deployLongitude != null and param2.deployLongitude != ''">
                and deploy_longitude = #{param2.deployLongitude}
            </if>
            <if test="param2.deployLatitude != null and param2.deployLatitude != ''">
                and deploy_latitude = #{param2.deployLatitude}
            </if>
            <if test="param2.coverRadiusM != null and param2.coverRadiusM != ''">
                and cover_radius_m = #{param2.coverRadiusM}
            </if>
            <if test="param2.workMode != null and param2.workMode != ''">
                and work_mode = #{param2.workMode}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -28,7 +28,70 @@
    <select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
        select * from ja_fw_task_schedule where is_deleted = 0
        select * from ja_fw_task_schedule
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
                and area_divide_id = #{param2.areaDivideId}
            </if>
            <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
                and defense_scene_id = #{param2.defenseSceneId}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
                and dispatch_user = #{param2.dispatchUser}
            </if>
            <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
                and dispatch_start_time = #{param2.dispatchStartTime}
            </if>
            <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
                and dispatch_end_time = #{param2.dispatchEndTime}
            </if>
            <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
                and dispatch_content = #{param2.dispatchContent}
            </if>
            <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
                and dispatch_result = #{param2.dispatchResult}
            </if>
            <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
                and dispose_measure = #{param2.disposeMeasure}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml
@@ -20,7 +20,46 @@
    <select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
        select * from ja_fw_device_maintain_plan where is_deleted = 0
        select * from ja_fw_device_maintain_plan
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.planCycle != null and param2.planCycle != ''">
                and plan_cycle = #{param2.planCycle}
            </if>
            <if test="param2.planTime != null and param2.planTime != ''">
                and plan_time = #{param2.planTime}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainRecordMapper.xml
@@ -24,7 +24,58 @@
    <select id="selectFwDeviceMaintainRecordPage" resultMap="fwDeviceMaintainRecordResultMap">
        select * from ja_fw_device_maintain_record where is_deleted = 0
        select * from ja_fw_device_maintain_record
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.planId != null and param2.planId != ''">
                and plan_id = #{param2.planId}
            </if>
            <if test="param2.maintainTime != null and param2.maintainTime != ''">
                and maintain_time = #{param2.maintainTime}
            </if>
            <if test="param2.maintainContent != null and param2.maintainContent != ''">
                and maintain_content = #{param2.maintainContent}
            </if>
            <if test="param2.replacePart != null and param2.replacePart != ''">
                and replace_part = #{param2.replacePart}
            </if>
            <if test="param2.maintainResult != null and param2.maintainResult != ''">
                and maintain_result = #{param2.maintainResult}
            </if>
            <if test="param2.remark != null and param2.remark != ''">
                and remark = #{param2.remark}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -23,7 +23,55 @@
    <select id="selectFwDevicePage" resultMap="fwDeviceResultMap">
        select * from ja_fw_device where is_deleted = 0
        select * from ja_fw_device
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and device_name = #{param2.deviceName}
            </if>
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and device_type = #{param2.deviceType}
            </if>
            <if test="param2.deviceModel != null and param2.deviceModel != ''">
                and device_model = #{param2.deviceModel}
            </if>
            <if test="param2.deviceSpecification != null and param2.deviceSpecification != ''">
                and device_specification = #{param2.deviceSpecification}
            </if>
            <if test="param2.manufacturer != null and param2.manufacturer != ''">
                and manufacturer = #{param2.manufacturer}
            </if>
            <if test="param2.source != null and param2.source != ''">
                and source = #{param2.source}
            </if>
            <if test="param2.remark != null and param2.remark != ''">
                and remark = #{param2.remark}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml
@@ -21,7 +21,49 @@
    <select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
        select * from ja_fw_device_scrap where is_deleted = 0
        select * from ja_fw_device_scrap
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.scrapTime != null and param2.scrapTime != ''">
                and scrap_time = #{param2.scrapTime}
            </if>
            <if test="param2.scrapReason != null and param2.scrapReason != ''">
                and scrap_reason = #{param2.scrapReason}
            </if>
            <if test="param2.disposeWay != null and param2.disposeWay != ''">
                and dispose_way = #{param2.disposeWay}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneAlarmRecordMapper.xml
@@ -34,7 +34,88 @@
    <select id="selectFwDroneAlarmRecordPage" resultMap="fwDroneAlarmRecordResultMap">
        select * from ja_fw_drone_alarm_record where is_deleted = 0
        select * from ja_fw_drone_alarm_record
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.droneName != null and param2.droneName != ''">
                and drone_name = #{param2.droneName}
            </if>
            <if test="param2.droneSerialNo != null and param2.droneSerialNo != ''">
                and drone_serial_no = #{param2.droneSerialNo}
            </if>
            <if test="param2.droneType != null and param2.droneType != ''">
                and drone_type = #{param2.droneType}
            </if>
            <if test="param2.alarmType != null and param2.alarmType != ''">
                and alarm_type = #{param2.alarmType}
            </if>
            <if test="param2.alarmTime != null and param2.alarmTime != ''">
                and alarm_time = #{param2.alarmTime}
            </if>
            <if test="param2.triggerReason != null and param2.triggerReason != ''">
                and trigger_reason = #{param2.triggerReason}
            </if>
            <if test="param2.flightStatus != null and param2.flightStatus != ''">
                and flight_status = #{param2.flightStatus}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.signalFreqMhz != null and param2.signalFreqMhz != ''">
                and signal_freq_mhz = #{param2.signalFreqMhz}
            </if>
            <if test="param2.flightHeightM != null and param2.flightHeightM != ''">
                and flight_height_m = #{param2.flightHeightM}
            </if>
            <if test="param2.flightSpeedMs != null and param2.flightSpeedMs != ''">
                and flight_speed_ms = #{param2.flightSpeedMs}
            </if>
            <if test="param2.stayDuration != null and param2.stayDuration != ''">
                and stay_duration = #{param2.stayDuration}
            </if>
            <if test="param2.counterWay != null and param2.counterWay != ''">
                and counter_way = #{param2.counterWay}
            </if>
            <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
                and area_divide_id = #{param2.areaDivideId}
            </if>
            <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
                and defense_scene_id = #{param2.defenseSceneId}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordDetailMapper.xml
@@ -21,7 +21,49 @@
    <select id="selectFwDroneFlightRecordDetailPage" resultMap="fwDroneFlightRecordDetailResultMap">
        select * from ja_fw_drone_flight_record_detail where is_deleted = 0
        select * from ja_fw_drone_flight_record_detail
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.flightRecordId != null and param2.flightRecordId != ''">
                and flight_record_id = #{param2.flightRecordId}
            </if>
            <if test="param2.longitude != null and param2.longitude != ''">
                and longitude = #{param2.longitude}
            </if>
            <if test="param2.latitude != null and param2.latitude != ''">
                and latitude = #{param2.latitude}
            </if>
            <if test="param2.pointTime != null and param2.pointTime != ''">
                and point_time = #{param2.pointTime}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/mapper/FwDroneFlightRecordMapper.xml
@@ -23,7 +23,55 @@
    <select id="selectFwDroneFlightRecordPage" resultMap="fwDroneFlightRecordResultMap">
        select * from ja_fw_drone_flight_record where is_deleted = 0
        select * from ja_fw_drone_flight_record
        <where>
            is_deleted = 0
            <if test="param2.id != null and param2.id != ''">
                and id = #{param2.id}
            </if>
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and device_id = #{param2.deviceId}
            </if>
            <if test="param2.droneName != null and param2.droneName != ''">
                and drone_name = #{param2.droneName}
            </if>
            <if test="param2.serialNo != null and param2.serialNo != ''">
                and serial_no = #{param2.serialNo}
            </if>
            <if test="param2.alarmTime != null and param2.alarmTime != ''">
                and alarm_time = #{param2.alarmTime}
            </if>
            <if test="param2.triggerType != null and param2.triggerType != ''">
                and trigger_type = #{param2.triggerType}
            </if>
            <if test="param2.stayDuration != null and param2.stayDuration != ''">
                and stay_duration = #{param2.stayDuration}
            </if>
            <if test="param2.areaCode != null and param2.areaCode != ''">
                and area_code = #{param2.areaCode}
            </if>
            <if test="param2.createUser != null and param2.createUser != ''">
                and create_user = #{param2.createUser}
            </if>
            <if test="param2.createDept != null and param2.createDept != ''">
                and create_dept = #{param2.createDept}
            </if>
            <if test="param2.createTime != null and param2.createTime != ''">
                and create_time = #{param2.createTime}
            </if>
            <if test="param2.updateUser != null and param2.updateUser != ''">
                and update_user = #{param2.updateUser}
            </if>
            <if test="param2.updateTime != null and param2.updateTime != ''">
                and update_time = #{param2.updateTime}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and status = #{param2.status}
            </if>
            <if test="param2.isDeleted != null and param2.isDeleted != ''">
                and is_deleted = #{param2.isDeleted}
            </if>
        </where>
    </select>