mirror of
https://gitee.com/beecue/fastbee.git
synced 2025-12-19 17:35:54 +08:00
后端功能完善
This commit is contained in:
kerwincui
@@ -18,14 +18,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<resultMap type="IotDeviceListDto" id="IotDeviceListResult">
|
||||
<result property="deviceId" column="device_id" />
|
||||
<result property="deviceNum" column="device_num" />
|
||||
<result property="categoryId" column="category_id" />
|
||||
<result property="deviceName" column="device_name" />
|
||||
<result property="firmwareVersion" column="firmware_version" />
|
||||
<result property="ownerId" column="owner_id" />
|
||||
<result property="nickName" column="nick_name" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="isAlarm" column="is_alarm" />
|
||||
<result property="isRadar" column="is_radar" />
|
||||
<result property="isRfControl" column="is_rf_control" />
|
||||
<result property="networkAddress" column="network_address" />
|
||||
<result property="networkIp" column="network_ip" />
|
||||
<result property="relayStatus" column="relay_status" />
|
||||
<result property="lightStatus" column="light_status" />
|
||||
<result property="isOnline" column="is_online" />
|
||||
<result property="deviceTemperature" column="device_temperature" />
|
||||
<result property="rssi" column="rssi" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectIotDeviceVo">
|
||||
select device_id, device_num, category_id, device_name, firmware_version, owner_id, create_by, create_time, update_by, update_time, remark from iot_device
|
||||
</sql>
|
||||
|
||||
<select id="selectIotDeviceList" parameterType="IotDevice" resultMap="IotDeviceResult">
|
||||
<include refid="selectIotDeviceVo"/>
|
||||
<sql id="selectIotDeviceListVo">
|
||||
select d.device_id, d.device_num, d.category_id, d.device_name, d.firmware_version, d.owner_id, d.create_time,
|
||||
s.relay_status,s.light_status,s.is_online,s.rssi,s.device_temperature,
|
||||
t.network_address, t.network_ip,t.is_alarm, t.is_radar,t.is_rf_control,
|
||||
u.nick_name
|
||||
from iot_device d
|
||||
left join (select * from iot_device_set order by create_time desc limit 1) as t on d.device_id = t.device_id
|
||||
left join (select * from iot_device_status order by create_time desc limit 1 ) as s on d.device_id=s.device_id
|
||||
left join sys_user u on d.owner_id=u.user_id
|
||||
</sql>
|
||||
|
||||
<select id="selectIotDeviceList" parameterType="IotDevice" resultMap="IotDeviceListResult">
|
||||
<include refid="selectIotDeviceListVo"/>
|
||||
<where>
|
||||
del_flag= '0'
|
||||
d.del_flag= '0'
|
||||
<if test="deviceNum != null and deviceNum != ''"> and device_num like concat('%', #{deviceNum}, '%')</if>
|
||||
<if test="categoryId != null "> and category_id = #{categoryId}</if>
|
||||
<if test="deviceName != null and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
|
||||
@@ -39,6 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<include refid="selectIotDeviceVo"/>
|
||||
where device_id = #{deviceId}
|
||||
</select>
|
||||
|
||||
<select id="selectIotDeviceByNum" parameterType="String" resultMap="IotDeviceResult">
|
||||
<include refid="selectIotDeviceVo"/>
|
||||
where device_num = #{deviceNum}
|
||||
</select>
|
||||
|
||||
<insert id="insertIotDevice" parameterType="IotDevice" useGeneratedKeys="true" keyProperty="deviceId">
|
||||
insert into iot_device
|
||||
|
||||
@@ -13,6 +13,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="isHost" column="is_host" />
|
||||
<result property="isReset" column="is_reset" />
|
||||
<result property="isAp" column="is_ap" />
|
||||
<result property="isWifiOffline" column="is_wifi_offline" />
|
||||
<result property="isOpenCertifi" column="is_open_certifi" />
|
||||
<result property="isSmartConfig" column="is_smart_config" />
|
||||
<result property="isRfControl" column="is_rf_control" />
|
||||
<result property="isRfLearn" column="is_rf_learn" />
|
||||
<result property="isRfClear" column="is_rf_clear" />
|
||||
@@ -23,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="ownerId" column="owner_id" />
|
||||
<result property="networkAddress" column="network_address" />
|
||||
<result property="networkIp" column="network_ip" />
|
||||
<result property="radarInterval" column="radar_interval" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
@@ -31,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectIotDeviceSetVo">
|
||||
select device_set_id, device_id, device_num, is_alarm, is_radar, is_host, is_reset, is_ap, is_rf_control, is_rf_learn, is_rf_clear, rf_one_func, rf_two_func, rf_three_func, rf_four_func, owner_id, network_address, network_ip, create_by, create_time, update_by, update_time, remark from iot_device_set
|
||||
select device_set_id, device_id, device_num, is_alarm, is_radar, is_host, is_reset, is_ap, is_wifi_offline, is_open_certifi, is_smart_config, is_rf_control, is_rf_learn, is_rf_clear, rf_one_func, rf_two_func, rf_three_func, rf_four_func, owner_id, network_address, network_ip,radar_interval, create_by, create_time, update_by, update_time, remark from iot_device_set
|
||||
</sql>
|
||||
|
||||
<select id="selectIotDeviceSetList" parameterType="IotDeviceSet" resultMap="IotDeviceSetResult">
|
||||
@@ -48,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="networkAddress != null and networkAddress != ''"> and network_address like concat('%', #{networkAddress}, '%')</if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectIotDeviceSetById" parameterType="Long" resultMap="IotDeviceSetResult">
|
||||
@@ -73,6 +78,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="isHost != null">is_host,</if>
|
||||
<if test="isReset != null">is_reset,</if>
|
||||
<if test="isAp != null">is_ap,</if>
|
||||
<if test="isWifiOffline != null">is_wifi_offline,</if>
|
||||
<if test="isOpenCertifi != null">is_open_certifi,</if>
|
||||
<if test="isSmartConfig != null">is_smart_config,</if>
|
||||
<if test="isRfControl != null">is_rf_control,</if>
|
||||
<if test="isRfLearn != null">is_rf_learn,</if>
|
||||
<if test="isRfClear != null">is_rf_clear,</if>
|
||||
@@ -83,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="ownerId != null">owner_id,</if>
|
||||
<if test="networkAddress != null">network_address,</if>
|
||||
<if test="networkIp != null">network_ip,</if>
|
||||
<if test="radarInterval != null">radar_interval,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
@@ -98,6 +107,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="isHost != null">#{isHost},</if>
|
||||
<if test="isReset != null">#{isReset},</if>
|
||||
<if test="isAp != null">#{isAp},</if>
|
||||
<if test="isWifiOffline != null">#{isWifiOffline},</if>
|
||||
<if test="isOpenCertifi != null">#{isOpenCertifi},</if>
|
||||
<if test="isSmartConfig != null">#{isSmartConfig},</if>
|
||||
<if test="isRfControl != null">#{isRfControl},</if>
|
||||
<if test="isRfLearn != null">#{isRfLearn},</if>
|
||||
<if test="isRfClear != null">#{isRfClear},</if>
|
||||
@@ -108,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="ownerId != null">#{ownerId},</if>
|
||||
<if test="networkAddress != null">#{networkAddress},</if>
|
||||
<if test="networkIp != null">#{networkIp},</if>
|
||||
<if test="radarInterval != null">#{radarInterval},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
@@ -126,6 +139,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="isHost != null">is_host = #{isHost},</if>
|
||||
<if test="isReset != null">is_reset = #{isReset},</if>
|
||||
<if test="isAp != null">is_ap = #{isAp},</if>
|
||||
<if test="isWifiOffline != null">is_wifi_offline = #{isWifiOffline},</if>
|
||||
<if test="isOpenCertifi != null">is_open_certifi = #{isOpenCertifi},</if>
|
||||
<if test="isSmartConfig != null">is_smart_config = #{isSmartConfig},</if>
|
||||
<if test="isRfControl != null">is_rf_control = #{isRfControl},</if>
|
||||
<if test="isRfLearn != null">is_rf_learn = #{isRfLearn},</if>
|
||||
<if test="isRfClear != null">is_rf_clear = #{isRfClear},</if>
|
||||
@@ -136,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="ownerId != null">owner_id = #{ownerId},</if>
|
||||
<if test="networkAddress != null">network_address = #{networkAddress},</if>
|
||||
<if test="networkIp != null">network_ip = #{networkIp},</if>
|
||||
<if test="radarInterval != null">radar_interval = #{radarInterval},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
|
||||
@@ -12,13 +12,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<result property="lightStatus" column="light_status" />
|
||||
<result property="isOnline" column="is_online" />
|
||||
<result property="deviceTemperature" column="device_temperature" />
|
||||
<result property="deviceHumidity" column="device_humidity" />
|
||||
<result property="rssi" column="rssi" />
|
||||
<result property="airTemperature" column="air_temperature" />
|
||||
<result property="airHumidity" column="air_humidity" />
|
||||
<result property="triggerSource" column="trigger_source" />
|
||||
<result property="brightness" column="brightness" />
|
||||
<result property="lightInterval" column="light_interval" />
|
||||
<result property="lightMode" column="light_mode" />
|
||||
<result property="fadeTime" column="fade_time" />
|
||||
<result property="red" column="red" />
|
||||
<result property="green" column="green" />
|
||||
<result property="blue" column="blue" />
|
||||
@@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectIotDeviceStatusVo">
|
||||
select device_status_id, device_id, device_num, relay_status, light_status, is_online, device_temperature, device_humidity, air_temperature, air_humidity, trigger_source, brightness, light_interval, light_mode, red, green, blue, create_by, create_time, update_by, update_time, remark from iot_device_status
|
||||
select device_status_id, device_id, device_num, relay_status, light_status, is_online, device_temperature, rssi, air_temperature, air_humidity, trigger_source, brightness, light_interval, light_mode,fade_time, red, green, blue, create_by, create_time, update_by, update_time, remark from iot_device_status
|
||||
</sql>
|
||||
|
||||
<select id="selectIotDeviceStatusList" parameterType="IotDeviceStatus" resultMap="IotDeviceStatusResult">
|
||||
@@ -45,6 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="triggerSource != null "> and trigger_source = #{triggerSource}</if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
<select id="selectIotDeviceStatusById" parameterType="Long" resultMap="IotDeviceStatusResult">
|
||||
@@ -58,6 +60,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
order by create_time desc
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<select id="selectIotDeviceStatusByDeviceNum" parameterType="String" resultMap="IotDeviceStatusResult">
|
||||
<include refid="selectIotDeviceStatusVo"/>
|
||||
where device_num = #{deviceNum}
|
||||
order by create_time desc
|
||||
limit 1
|
||||
</select>
|
||||
|
||||
<insert id="insertIotDeviceStatus" parameterType="IotDeviceStatus" useGeneratedKeys="true" keyProperty="deviceStatusId">
|
||||
insert into iot_device_status
|
||||
@@ -68,13 +77,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="lightStatus != null">light_status,</if>
|
||||
<if test="isOnline != null">is_online,</if>
|
||||
<if test="deviceTemperature != null">device_temperature,</if>
|
||||
<if test="deviceHumidity != null">device_humidity,</if>
|
||||
<if test="rssi != null">rssi,</if>
|
||||
<if test="airTemperature != null">air_temperature,</if>
|
||||
<if test="airHumidity != null">air_humidity,</if>
|
||||
<if test="triggerSource != null">trigger_source,</if>
|
||||
<if test="brightness != null">brightness,</if>
|
||||
<if test="lightInterval != null">light_interval,</if>
|
||||
<if test="lightMode != null">light_mode,</if>
|
||||
<if test="fadeTime != null">fade_time,</if>
|
||||
<if test="red != null">red,</if>
|
||||
<if test="green != null">green,</if>
|
||||
<if test="blue != null">blue,</if>
|
||||
@@ -91,13 +101,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="lightStatus != null">#{lightStatus},</if>
|
||||
<if test="isOnline != null">#{isOnline},</if>
|
||||
<if test="deviceTemperature != null">#{deviceTemperature},</if>
|
||||
<if test="deviceHumidity != null">#{deviceHumidity},</if>
|
||||
<if test="rssi != null">#{rssi},</if>
|
||||
<if test="airTemperature != null">#{airTemperature},</if>
|
||||
<if test="airHumidity != null">#{airHumidity},</if>
|
||||
<if test="triggerSource != null">#{triggerSource},</if>
|
||||
<if test="brightness != null">#{brightness},</if>
|
||||
<if test="lightInterval != null">#{lightInterval},</if>
|
||||
<if test="lightMode != null">#{lightMode},</if>
|
||||
<if test="fadeTime != null">#{fadeTime},</if>
|
||||
<if test="red != null">#{red},</if>
|
||||
<if test="green != null">#{green},</if>
|
||||
<if test="blue != null">#{blue},</if>
|
||||
@@ -118,13 +129,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
<if test="lightStatus != null">light_status = #{lightStatus},</if>
|
||||
<if test="isOnline != null">is_online = #{isOnline},</if>
|
||||
<if test="deviceTemperature != null">device_temperature = #{deviceTemperature},</if>
|
||||
<if test="deviceHumidity != null">device_humidity = #{deviceHumidity},</if>
|
||||
<if test="rssi != null">rssi = #{rssi},</if>
|
||||
<if test="airTemperature != null">air_temperature = #{airTemperature},</if>
|
||||
<if test="airHumidity != null">air_humidity = #{airHumidity},</if>
|
||||
<if test="triggerSource != null">trigger_source = #{triggerSource},</if>
|
||||
<if test="brightness != null">brightness = #{brightness},</if>
|
||||
<if test="lightInterval != null">light_interval = #{lightInterval},</if>
|
||||
<if test="lightMode != null">light_mode = #{lightMode},</if>
|
||||
<if test="fadeTime != null">fade_time = #{fadeTime},</if>
|
||||
<if test="red != null">red = #{red},</if>
|
||||
<if test="green != null">green = #{green},</if>
|
||||
<if test="blue != null">blue = #{blue},</if>
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
<?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">
|
||||
<mapper namespace="com.ruoyi.system.mapper.IotGroupMapper">
|
||||
|
||||
<resultMap type="IotGroup" id="IotGroupResult">
|
||||
<result property="groupId" column="group_id" />
|
||||
<result property="userId" column="user_id" />
|
||||
<result property="groupName" column="group_name" />
|
||||
<result property="groupOrder" column="group_order" />
|
||||
<result property="delFlag" column="del_flag" />
|
||||
<result property="createBy" column="create_by" />
|
||||
<result property="createTime" column="create_time" />
|
||||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
</resultMap>
|
||||
|
||||
<sql id="selectIotGroupVo">
|
||||
select group_id, user_id, group_name, group_order, del_flag, create_by, create_time, update_by, update_time, remark from iot_group
|
||||
</sql>
|
||||
|
||||
<select id="selectIotGroupList" parameterType="IotGroup" resultMap="IotGroupResult">
|
||||
<include refid="selectIotGroupVo"/>
|
||||
<where>
|
||||
<if test="userId != null "> and user_id = #{userId}</if>
|
||||
<if test="groupName != null and groupName != ''"> and group_name like concat('%', #{groupName}, '%')</if>
|
||||
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
<select id="selectIotGroupById" parameterType="Long" resultMap="IotGroupResult">
|
||||
<include refid="selectIotGroupVo"/>
|
||||
where group_id = #{groupId}
|
||||
</select>
|
||||
|
||||
<insert id="insertIotGroup" parameterType="IotGroup" useGeneratedKeys="true" keyProperty="groupId">
|
||||
insert into iot_group
|
||||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null">user_id,</if>
|
||||
<if test="groupName != null and groupName != ''">group_name,</if>
|
||||
<if test="groupOrder != null">group_order,</if>
|
||||
<if test="delFlag != null">del_flag,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
<if test="updateBy != null">update_by,</if>
|
||||
<if test="updateTime != null">update_time,</if>
|
||||
<if test="remark != null">remark,</if>
|
||||
</trim>
|
||||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="userId != null">#{userId},</if>
|
||||
<if test="groupName != null and groupName != ''">#{groupName},</if>
|
||||
<if test="groupOrder != null">#{groupOrder},</if>
|
||||
<if test="delFlag != null">#{delFlag},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
<if test="updateBy != null">#{updateBy},</if>
|
||||
<if test="updateTime != null">#{updateTime},</if>
|
||||
<if test="remark != null">#{remark},</if>
|
||||
</trim>
|
||||
</insert>
|
||||
|
||||
<update id="updateIotGroup" parameterType="IotGroup">
|
||||
update iot_group
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="userId != null">user_id = #{userId},</if>
|
||||
<if test="groupName != null and groupName != ''">group_name = #{groupName},</if>
|
||||
<if test="groupOrder != null">group_order = #{groupOrder},</if>
|
||||
<if test="delFlag != null">del_flag = #{delFlag},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
<if test="updateBy != null">update_by = #{updateBy},</if>
|
||||
<if test="updateTime != null">update_time = #{updateTime},</if>
|
||||
<if test="remark != null">remark = #{remark},</if>
|
||||
</trim>
|
||||
where group_id = #{groupId}
|
||||
</update>
|
||||
|
||||
<delete id="deleteIotGroupById" parameterType="Long">
|
||||
delete from iot_group where group_id = #{groupId}
|
||||
</delete>
|
||||
|
||||
<delete id="deleteIotGroupByIds" parameterType="String">
|
||||
delete from iot_group where group_id in
|
||||
<foreach item="groupId" collection="array" open="(" separator="," close=")">
|
||||
#{groupId}
|
||||
</foreach>
|
||||
</delete>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user