From b6d477ad41e2a8ff9393de2beba2e735c78cf781 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 22 七月 2024 18:06:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
index d1f7c46..e969c66 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwThresholdMapper.xml
@@ -1,71 +1,94 @@
<?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.ycl.platform.mapper.YwThresholdMapper">
-
+
<resultMap type="YwThreshold" id="YwThresholdResult">
- <result property="id" column="id"/>
- <result property="monitorType" column="monitor_type"/>
- <result property="createTime" column="create_time"/>
- <result property="updateTime" column="update_time"/>
- <result property="deleted" column="deleted"/>
+ <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>
+ <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>
-
+
<insert id="insertYwThreshold" parameterType="YwThreshold" useGeneratedKeys="true" keyProperty="id">
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>
<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>
+ </trim>
</insert>
<update id="updateYwThreshold" parameterType="YwThreshold">
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">
- delete from t_yw_threshold where id in
+ delete from t_yw_threshold where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
-</mapper>
+</mapper>
\ No newline at end of file
--
Gitblit v1.8.0