code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-18 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

设备解绑功能完善

Browse Source
This commit is contained in:
kerwincui
2022-06-09 17:09:07 +08:00
parent 0052178b5a
commit 44ed5a27b3
18 changed files with 161 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
springboot/wumei-iot/src/main/resources/mapper/iot/DeviceLogMapper.xml
View File

@@ -120,10 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</foreach>
</delete>
<delete id="deleteDeviceLogByDeviceIds" parameterType="String">
delete from iot_device_log where device_id in
<foreach item="deviceId" collection="array" open="(" separator="," close=")">
#{deviceId}
</foreach>
<delete id="deleteDeviceLogByDeviceId" parameterType="Long">
delete from iot_device_log where device_id = #{deviceId}
</delete>
</mapper>

17
springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
View File

@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.device_id, d.device_name, d.product_name, d.user_name, d.serial_number, d.firmware_version, d.status,d.rssi,d.is_shadow ,
d.location_way, d.active_time,d.network_address,d.longitude,latitude
from iot_device d
left join iot_device_user u on u.device_id = d.device_id
inner join iot_device_user u on u.device_id = d.device_id
<where>
<if test="userId != null "> and u.user_id = #{userId}</if>
<if test="deviceName != null and deviceName != ''"> and d.device_name like concat('%', #{deviceName}, '%')</if>
@@ -169,7 +169,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select d.device_id, d.device_name, d.product_name, d.user_name, d.serial_number, d.firmware_version, d.status,d.rssi,d.is_shadow ,
d.location_way, d.active_time,d.network_address,d.longitude,latitude
from iot_device d
left join iot_device_user u on u.device_id = d.device_id
inner join iot_device_user u on u.device_id = d.device_id
<where>
<if test="userId != null "> and u.user_id = #{userId}</if>
<if test="tenantId != null "> and d.tenant_id = #{tenantId}</if>
@@ -191,7 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way,
d.things_model_value, d.active_time,d.img_url,u.user_id
from iot_device d
left join iot_device_user u on u.device_id = d.device_id
inner join iot_device_user u on u.device_id = d.device_id
<if test="groupId != null and groupId !=0 "> left join iot_device_group g on g.device_id=d.device_id </if>
<where>
<if test="groupId != null and groupId !=0 "> and g.group_id = #{groupId}</if>
@@ -406,10 +406,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(*) from iot_device where serial_number = #{deviceNum}
</select>
<delete id="deleteDeviceGroupByDeviceIds" parameterType="String">
delete from iot_device_group where device_id in
<foreach item="deviceId" collection="array" open="(" separator="," close=")">
#{deviceId}
</foreach>
<delete id="deleteDeviceGroupByDeviceId" parameterType="com.ruoyi.iot.model.UserIdAndDeviceIdModel">
delete from iot_device_group
<where>
<if test="1==1"> and device_id = #{deviceId}</if>
<if test="userId != null">user_id = #{userId}</if>
</where>
</delete>
</mapper>

8
springboot/wumei-iot/src/main/resources/mapper/iot/DeviceUserMapper.xml
View File

@@ -106,8 +106,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where device_id = #{deviceId} and user_id = #{userId}
</update>
<delete id="deleteDeviceUserByDeviceId" parameterType="Long">
delete from iot_device_user where device_id = #{deviceId} and is_owner !=1
<delete id="deleteDeviceUserByDeviceId" parameterType="com.ruoyi.iot.model.UserIdAndDeviceIdModel">
delete from iot_device_user
<where>
<if test="1==1"> and device_id = #{deviceId}</if>
<if test="userId != null">user_id = #{userId}</if>
</where>
</delete>
<delete id="deleteDeviceUserByDeviceIds" parameterType="String">

22
springboot/wumei-iot/src/main/resources/mapper/tdengine/TDDeviceLogMapper.xml
View File

@@ -95,18 +95,22 @@
<delete id="delete" parameterType="com.ruoyi.iot.domain.DeviceLog">
delete from ${database}.device_${device.serialNumber}
<where>
<if test="logId !=null">
log_id = #{logId}
</if>
<if test="deviceId !=null and deviceId!=''">
device_id = #{deviceId}
</if>
<if test="serialNumber !=null and serialNumber!=''">
serial_number = #{serialNumber}
</if>
<if test="logId !=null"> log_id = #{logId} </if>
<if test="deviceId !=null and deviceId!=''"> device_id = #{deviceId} </if>
<if test="serialNumber !=null and serialNumber!=''"> serial_number = #{serialNumber} </if>
</where>
</delete>
<delete id="deleteDeviceLogByDeviceId" parameterType="com.ruoyi.iot.domain.DeviceLog">
delete from ${database}.device_${device.serialNumber}
<where>
<if test="logId !=null"> log_id = #{logId} </if>
<if test="deviceId !=null and deviceId!=''"> device_id = #{deviceId} </if>
<if test="serialNumber !=null and serialNumber!=''"> serial_number = #{serialNumber} </if>
</where>
</delete>
<select id="selectLogList" resultMap="BaseResultMap">
select * from ${database}.device_log
<where>