工单优化

linwei

2026-02-05 08d4bb2bf4bfadc9ab5fcf6b0a2bfb543d22b2a0

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdManageDeviceMapper.xml

@@ -3,53 +3,46 @@
<mapper namespace="org.sxkj.gd.workorder.mapper.GdManageDeviceMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="gdManageDeviceResultMap" type="org.sxkj.gd.workorder.entity.GdManageDeviceEntity">
    <resultMap id="gdManageDeviceResultMap" type="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
        <result column="id" property="id"/>
        <result column="device_sn" property="deviceSn"/>
        <result column="device_name" property="deviceName"/>
        <result column="nickname" property="nickname"/>
        <result column="device_type" property="deviceType"/>
        <result column="device_payload" property="devicePayload"/>
        <result column="longitude" property="longitude"/>
        <result column="latitude" property="latitude"/>
        <result column="firmware_version" property="firmwareVersion"/>
        <result column="child_sn" property="childSn"/>
         <result column="mode_code" property="modeCode"/>
        <result column="insure_expired_time" property="insureExpiredTime"/>
        <result column="traffic_remaining" property="trafficRemaining"/>
        <result column="traffic_expire_time" property="trafficExpireTime"/>
        <result column="create_time" property="createTime"/>
        <result column="update_time" property="updateTime"/>
        <result column="is_deleted" property="isDeleted"/>
        <result column="device_dept_name" property="deviceDeptName"/>
    </resultMap>


    <select id="selectGdManageDevicePage" resultMap="gdManageDeviceResultMap">
        select
            id,
            device_sn,
            device_name,
            nickname,
            device_payload,
            longitude,
            latitude,
            location
            md.*,
            bd.dept_name as device_dept_name
        from
            ja_gd_manage_device
            ja_gd_manage_device md
        left join
                blade_dept bd on md.create_dept = bd.id
        <where>
            <if test="deviceName != null and deviceName != ''">
                and device_name like concat('%',#{deviceName},'%')
                and md.is_deleted = 0
            <if test="param2.nickname != null and param2.nickname != ''">
                and md.nickname like concat('%',#{param2.nickname},'%')
            </if>
            <if test="nickname != null and nickname != ''">
                and nickname like concat('%',#{nickname},'%')
            <if test="param2.deptId != null">
                and md.create_dept = #{param2.deptId}
            </if>
            <if test="deptId != null">
                and create_dept = #{deptId}
            <if test="param2.location != null and param2.location != ''">
                and md.location like concat('%',#{param2.location},'%')
            </if>
            <if test="location != null and location != ''">
                and location like concat('%',#{location},'%')
            <if test="param2.modeCode != null and param2.modeCode != ''">
                and md.mode_code = #{param2.modeCode}
            </if>
                and is_deleted = 0
            <if test="param2.deviceType != null and param2.deviceType != ''">
                and md.device_type = #{param2.deviceType}
            </if>

        </where>
    </select>

@@ -63,35 +56,36 @@

    <select id="selectGdManageDevice" resultType="org.sxkj.gd.workorder.vo.GdManageDeviceVO">
        select
            id,
            device_sn,
            device_name,
            nickname,
            device_payload,
            longitude,
            latitude,
            geom
            md.id,
            md.device_sn,
            md.device_name,
            md.nickname,
            md.device_payload,
            md.longitude,
            md.latitude,
            md.geom,
            d2.height as height
        from
            ja_gd_manage_device
            ja_gd_manage_device md
        left join ja_gd_manage_device d2 on md.device_sn = d2.device_sn and d2.device_type = '0'
        <where>
            <if test="deviceIds != null and deviceIds.size() > 0">
                and id in
                and md.id in
                <foreach item="item" collection="deviceIds" index="index" open="(" close=")" separator=",">
                    #{item}
                </foreach>
            </if>
            <if test="devicePayload != null and devicePayload != ''">
                and device_payload like concat('%',#{devicePayload},'%')
                and md.device_payload like concat('%',#{devicePayload},'%')
            </if>
            <if test="geom != null and geom != ''">
                and ST_Intersects(geom, ST_GeomFromText(#{geom}))
                and ST_Intersects(md.geom, ST_GeomFromText(#{geom}))
            </if>
                and is_deleted = 0
            <if test="deviceType != null and deviceType != '' ">
                and md.device_type = #{deviceType}
            </if>
                and md.is_deleted = 0
        </where>


                <if test="isDeleted != null">
                and is_deleted = #{isDeleted}
            </if></select>
    </select>

</mapper>