2021年9月2日10:07:12 1.增加微信小程序接口 2.4G开关功能接口

This commit is contained in:
xxmfl
2021-09-02 10:08:27 +08:00
parent 5c97293269
commit a8bc50f67c
337 changed files with 16032 additions and 12055 deletions

View File

@@ -1,40 +1,43 @@
<?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.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" />
<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
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>
<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=",">
@@ -47,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="userId != null">#{userId},</if>
<if test="groupName != null and groupName != ''">#{groupName},</if>
@@ -58,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</trim>
</insert>
<update id="updateIotGroup" parameterType="IotGroup">
@@ -82,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete>
<delete id="deleteIotGroupByIds" parameterType="String">
delete from iot_group where group_id in
delete from iot_group where group_id in
<foreach item="groupId" collection="array" open="(" separator="," close=")">
#{groupId}
</foreach>