Merge remote-tracking branch 'origin/master'

xiangpei

2024-07-22 b6d477ad41e2a8ff9393de2beba2e735c78cf781

 ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml

@@ -7,24 +7,34 @@
    <resultMap type="YwThreshold" id="YwThresholdResult">
        <result property="id" column="id"/>
        <result property="monitorType" column="monitor_type"/>
        <result property="countType"    column="count_type"    />
        <result property="name"    column="name"    />
        <result property="value"    column="value"    />
        <result property="valueAuto"    column="value_auto"    />
        <result property="createTime" column="create_time"/>
        <result property="updateTime" column="update_time"/>
        <result property="description"    column="description"    />
        <result property="deleted" column="deleted"/>
    </resultMap>

    <sql id="selectYwThresholdVo">
        select id, monitor_type, create_time, update_time, deleted
        from t_yw_threshold
        select id, monitor_type, count_type, name, value, value_auto, create_time, update_time, description, deleted from t_yw_threshold
    </sql>

    <select id="selectYwThresholdList" parameterType="YwThreshold" resultMap="YwThresholdResult">
        <include refid="selectYwThresholdVo"/>
        <where>
            <if test="monitorType != null  and monitorType != ''">and monitor_type = #{monitorType}</if>
            <if test="countType != null  and countType != ''"> and count_type = #{countType}</if>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="value != null  and value != ''"> and value = #{value}</if>
            <if test="valueAuto != null  and valueAuto != ''"> and value_auto = #{valueAuto}</if>
            <if test="description != null  and description != ''"> and description = #{description}</if>
            <if test="deleted != null  and deleted != ''"> and deleted = #{deleted}</if>
        </where>
    </select>

    <select id="selectYwThresholdById" parameterType="Integer" resultMap="YwThresholdResult">
    <select id="selectYwThresholdById" parameterType="Long" resultMap="YwThresholdResult">
        <include refid="selectYwThresholdVo"/>
        where id = #{id}
    </select>
@@ -33,14 +43,24 @@
        insert into t_yw_threshold
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="monitorType != null and monitorType != ''">monitor_type,</if>
            <if test="countType != null">count_type,</if>
            <if test="name != null">name,</if>
            <if test="value != null">value,</if>
            <if test="valueAuto != null">value_auto,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="description != null">description,</if>
            <if test="deleted != null">deleted,</if>
        </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="monitorType != null and monitorType != ''">#{monitorType},</if>
            <if test="countType != null">#{countType},</if>
            <if test="name != null">#{name},</if>
            <if test="value != null">#{value},</if>
            <if test="valueAuto != null">#{valueAuto},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="description != null">#{description},</if>
            <if test="deleted != null">#{deleted},</if>
        </trim>
    </insert>
@@ -49,17 +69,20 @@
        update t_yw_threshold
        <trim prefix="SET" suffixOverrides=",">
            <if test="monitorType != null and monitorType != ''">monitor_type = #{monitorType},</if>
            <if test="countType != null">count_type = #{countType},</if>
            <if test="name != null">name = #{name},</if>
            <if test="value != null">value = #{value},</if>
            <if test="valueAuto != null">value_auto = #{valueAuto},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="description != null">description = #{description},</if>
            <if test="deleted != null">deleted = #{deleted},</if>
        </trim>
        where id = #{id}
    </update>

    <delete id="deleteYwThresholdById" parameterType="Integer">
        delete
        from t_yw_threshold
        where id = #{id}
    <delete id="deleteYwThresholdById" parameterType="Long">
        delete from t_yw_threshold where id = #{id}
    </delete>

    <delete id="deleteYwThresholdByIds" parameterType="String">