add-反无大屏-基础管理-设备相关

xiebin

2026-01-09 282f6e008cde71af551999a63afbe61721779287

add-反无大屏-基础管理-设备相关

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMaintainPlanMapper.xml

@@ -19,11 +19,10 @@
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="create_time" property="createTime"/>
        <result column="device_create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
        select
    <sql id="deviceFields">
        b.device_name,
        b.device_type,
        b.device_att,
@@ -34,8 +33,12 @@
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        b.create_time
    </sql>

    <select id="getFwDeviceMaintainPlanById" resultMap="fwDeviceMaintainPlanResultMap">
        select
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_maintain_plan a
        left join ja_fw_device b on (a.device_id = b.id)
@@ -50,18 +53,7 @@

    <select id="selectFwDeviceMaintainPlanPage" resultMap="fwDeviceMaintainPlanResultMap">
        select
            b.device_name,
            b.device_type,
            b.device_att,
            b.device_model,
            b.belong_dept,
            b.device_specification,
            b.manufacturer,
            b.source,
            b.purpose,
            b.charger,
            b.create_time,
            a.*
            <include refid="deviceFields"/>,a.*
        from
            ja_fw_device_maintain_plan a
        left join ja_fw_device b on (a.device_id = b.id)

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceScrapMapper.xml

@@ -19,11 +19,10 @@
        <result column="source" property="source"/>
        <result column="purpose" property="purpose"/>
        <result column="charger" property="charger"/>
        <result column="create_time" property="createTime"/>
        <result column="device_create_time" property="createTime"/>
    </resultMap>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
    <sql id="deviceFields">
        b.device_name,
        b.device_type,
        b.device_att,
@@ -34,8 +33,12 @@
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
        b.create_time
    </sql>

    <select id="getFwDeviceScrapById" resultMap="fwDeviceScrapResultMap">
        select
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)
@@ -50,18 +53,7 @@

    <select id="selectFwDeviceScrapPage" resultMap="fwDeviceScrapResultMap">
        select
        b.device_name,
        b.device_type,
        b.device_att,
        b.device_model,
        b.belong_dept,
        b.device_specification,
        b.manufacturer,
        b.source,
        b.purpose,
        b.charger,
        b.create_time,
        a.*
            <include refid="deviceFields"/>,a.*
        from
        ja_fw_device_scrap a
        left join ja_fw_device b on (a.device_id = b.id)