From d85713cca5443547a7d4646d4e80abfce136eff8 Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期二, 02 七月 2024 15:54:17 +0800 Subject: [PATCH] 电磁锁根据三一车辆主键删除提交 --- ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml | 90 +++++++++++++++++++++++++++----------------- 1 files changed, 55 insertions(+), 35 deletions(-) diff --git a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml index 4dc7134..f7e7cb2 100644 --- a/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml +++ b/ard-work/src/main/resources/mapper/device/ArdEquipRadarMapper.xml @@ -1,32 +1,33 @@ <?xml version="1.0" encoding="UTF-8" ?> <!DOCTYPE mapper -PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" -"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.ruoyi.device.radar.mapper.ArdEquipRadarMapper"> - + <resultMap type="ArdEquipRadar" id="ArdEquipRadarResult"> - <result property="id" column="id" /> - <result property="name" column="name" /> - <result property="createBy" column="create_by" /> - <result property="port" column="port" /> - <result property="operate" column="operate" /> - <result property="createTime" column="create_time" /> - <result property="updateBy" column="update_by" /> - <result property="updateTime" column="update_time" /> - <result property="delFlag" column="del_flag" /> - <result property="userId" column="user_id" /> - <result property="longitude" column="longitude" /> - <result property="latitude" column="latitude" /> - <result property="altitude" column="altitude" /> - <result property="radarDate" column="radar_date" /> - <result property="deptId" column="dept_id" /> - <result property="pitch" column="pitch" /> - <result property="towerId" column="tower_id" /> - <result property="imageWidth" column="image_width" /> - <result property="imageHeight" column="image_height" /> - <result property="type" column="type" /> - <result property="ip" column="ip" /> - <result property="towerName" column="name" /> + <result property="id" column="id"/> + <result property="name" column="name"/> + <result property="createBy" column="create_by"/> + <result property="port" column="port"/> + <result property="operate" column="operate"/> + <result property="createTime" column="create_time"/> + <result property="updateBy" column="update_by"/> + <result property="updateTime" column="update_time"/> + <result property="delFlag" column="del_flag"/> + <result property="userId" column="user_id"/> + <result property="longitude" column="longitude"/> + <result property="latitude" column="latitude"/> + <result property="altitude" column="altitude"/> + <result property="radarDate" column="radar_date"/> + <result property="deptId" column="dept_id"/> + <result property="pitch" column="pitch"/> + <result property="towerId" column="tower_id"/> + <result property="imageWidth" column="image_width"/> + <result property="imageHeight" column="image_height"/> + <result property="type" column="type"/> + <result property="ip" column="ip"/> + <result property="towerName" column="name"/> + <result property="state" column="state"/> </resultMap> <sql id="selectArdEquipRadarVo"> @@ -50,7 +51,8 @@ c.image_width, c.image_height, c.type, - c.ip + c.ip, + c.state from ard_equip_radar c left join sys_dept d on d.dept_id = c.dept_id left join sys_user u on u.user_id = c.user_id @@ -78,13 +80,16 @@ c.image_height, c.type, c.ip, - t.name + t.name, + c.state from ard_equip_radar c left join sys_dept d on d.dept_id = c.dept_id left join sys_user u on u.user_id = c.user_id left join ard_towers t on t.id = c.tower_id <where> - <if test="towerId != null and towerId != ''"> and c.tower_id = #{towerId}</if> + <if test="towerId != null and towerId != ''">and c.tower_id = #{towerId}</if> + <if test="ip != null and ip != ''">and c.ip = #{ip}</if> + <if test="type != null and type != ''">and c.type = #{type}</if> <if test="userId != null and userId != ''">and c.user_id = #{userId}</if> <if test="deptId != null ">and (c.dept_id = #{deptId} OR c.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE cast(#{deptId} as varchar) = any(string_to_array(ancestors,',')) )) @@ -99,12 +104,12 @@ ${params.dataScope} </where> </select> - + <select id="selectArdEquipRadarById" parameterType="String" resultMap="ArdEquipRadarResult"> <include refid="selectArdEquipRadarVo"/> where id = #{id} </select> - + <insert id="insertArdEquipRadar" parameterType="ArdEquipRadar"> insert into ard_equip_radar <trim prefix="(" suffix=")" suffixOverrides=","> @@ -129,7 +134,8 @@ <if test="imageHeight != null">image_height,</if> <if test="type != null">type,</if> <if test="ip != null">ip,</if> - </trim> + <if test="state != null">state,</if> + </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> <if test="name != null">#{name},</if> @@ -152,7 +158,8 @@ <if test="imageHeight != null">#{imageHeight},</if> <if test="type != null">#{type},</if> <if test="ip != null">#{ip},</if> - </trim> + <if test="state != null">#{state},</if> + </trim> </insert> <update id="updateArdEquipRadar" parameterType="ArdEquipRadar"> @@ -178,18 +185,31 @@ <if test="imageHeight != null">image_height = #{imageHeight},</if> <if test="type != null">type = #{type},</if> <if test="ip != null">ip = #{ip},</if> + <if test="state != null">state = #{state},</if> </trim> where id = #{id} </update> <delete id="deleteArdEquipRadarById" parameterType="String"> - delete from ard_equip_radar where id = #{id} + delete + from ard_equip_radar + where id = #{id} </delete> <delete id="deleteArdEquipRadarByIds" parameterType="String"> - delete from ard_equip_radar where id in + delete from ard_equip_radar where id in <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach> </delete> -</mapper> \ No newline at end of file + + <select id="getCameraByRadar" resultType="ArdCameras"> + select ac.* from ard_equip_radar aer + INNER JOIN ard_towers at on aer.tower_id= at.id + INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id + where aer.id=#{radarId} and gdtype='1' limit 1 + </select> + <select id="selectArdRadarsByDeptId" parameterType="Long" resultMap="ArdEquipRadarResult"> + select * from ard_equip_radar where dept_id = #{deptId} + </select> +</mapper> -- Gitblit v1.9.3