Merge branch 'cjl' into dev

cjl

2023-08-26 6d4ee331b8fa5fc65a7a875a54b32118e9cd903f

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

@@ -10,14 +10,14 @@
                    <result column="code" property="code" />
                    <result column="upper" property="upper" />
                    <result column="lower" property="lower" />
                    <result column="default_util" property="defaultUtil" />
                    <result column="default_unit_key" property="defaultUnitKey" />
                    <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.upper,s.lower,s.default_util,s.create_time,s.update_time,s.is_delete
            s.id,s.name,s.code,s.desc,s.upper,s.lower,s.default_unit_key,s.create_time,s.update_time,s.is_delete
    </sql>

    <insert id="insertOne" parameterType="com.moral.api.entity.Sensor">
@@ -38,8 +38,8 @@
            <if test="lower != null">
                lower,
            </if>
            <if test="defaultUtil != null">
                default_util,
            <if test="defaultUnitKey != null">
                default_unit_key,
            </if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -58,8 +58,8 @@
            <if test="lower != null">
                #{lower},
            </if>
            <if test="defaultUtil != null">
                #{defaultUtil},
            <if test="defaultUnitKey != null">
                #{defaultUnitKey},
            </if>
        </trim>
    </insert>
@@ -85,13 +85,23 @@
                code = #{code},
            </if>
            <if test="upper != null">
                upper = #{upper},
                <if test="upper == ''">
                    upper = null,
                </if>
                <if test="upper != ''">
                    upper = #{upper},
                </if>
            </if>
            <if test="lower != null">
                lower = #{lower},
                <if test="lower == ''">
                    lower = null,
                </if>
                <if test="lower != ''">
                    lower = #{lower},
                </if>
            </if>
            <if test="default_util != null">
                default_util = #{default_util},
            <if test="default_unit_key != null">
                default_unit_key = #{default_unit_key},
            </if>
            <if test="isDelete != null">
                is_delete = #{isDelete},