Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-05-20 e7bc156f901b06e5af54cfe86fe53e7491af7b7f

 screen-manage/src/main/resources/mapper/SensorMapper.xml

@@ -8,13 +8,16 @@
                    <result column="name" property="name" />
                    <result column="desc" property="desc" />
                    <result column="code" property="code" />
                    <result column="upper" property="upper" />
                    <result column="lower" property="lower" />
                    <result column="default_util" property="defaultUtil" />
                    <result column="create_time" property="createTime" />
                    <result column="update_time" property="updateTime" />
                    <result column="is_delete" property="isDelete" />
        </resultMap>

    <sql id="Base_Column_List">
            s.id,s.name,s.code,s.desc,s.create_time,s.update_time,s.is_delete
            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_util,s.create_time,s.update_time,s.is_delete
    </sql>

    <insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -29,6 +32,15 @@
            <if test="desc != null">
                `desc`,
            </if>
            <if test="upper != null">
                upper,
            </if>
            <if test="lower != null">
                lower,
            </if>
            <if test="defaultUtil != null">
                default_util,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="name != null">
@@ -39,6 +51,15 @@
            </if>
            <if test="desc != null">
                #{desc},
            </if>
            <if test="upper != null">
                #{upper},
            </if>
            <if test="lower != null">
                #{lower},
            </if>
            <if test="defaultUtil != null">
                #{defaultUtil},
            </if>
        </trim>
    </insert>
@@ -63,6 +84,15 @@
            <if test="code != null">
                code = #{code},
            </if>
            <if test="upper != null">
                upper = #{upper},
            </if>
            <if test="lower != null">
                lower = #{lower},
            </if>
            <if test="default_util != null">
                default_util = #{default_util},
            </if>
            <if test="isDelete != null">
                is_delete = #{isDelete},
            </if>