From 29807fea73899a5b775eb2c7d8e1c05ea8bc0c3d Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期五, 02 八月 2024 17:00:31 +0800
Subject: [PATCH] 2024-08-02 朱宝民 优化获取全部取水口接口，包含经纬度及12小时之内的报警信息
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
index 28fb02a..4b4bcd7 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaBlockMapper.xml
@@ -10,35 +10,49 @@
<result column="phone" jdbcType="VARCHAR" property="phone" />
<result column="area" jdbcType="INTEGER" property="area" />
<result column="color" jdbcType="VARCHAR" property="color" />
+ <result column="remark" jdbcType="VARCHAR" property="remark" />
<result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, `name`, `header`, phone, area, color,deleted
+ id, `name`, `header`, phone, area, color, remark, deleted
+ </sql>
+ <sql id="part_Column_List">
+ <!--@mbg.generated-->
+ id, `name`
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<!--@mbg.generated-->
select
<include refid="Base_Column_List" />
from ba_block
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id,jdbcType=BIGINT} and deleted = 0
</select>
- <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
+
+ <select id="selectAll" resultMap="BaseResultMap">
+ select
+<!-- <include refid="part_Column_List" />-->
+ <include refid="Base_Column_List" />
+ from ba_block
+ WHERE deleted = 0
+ </select>
+
+<select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Long">
select
count(*)
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
- name like '%#{name,jdbcType=VARCHAR}%' and
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
- header = '#{header,jdbcType=VARCHAR}' and
+ <if test="header != null and header != ''">
+ header like concat('%', #{header}, '%') and
</if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = #{area,jdbcType=INTEGER} and
+ area = ${area} and
</if>
</trim>
</select>
@@ -48,36 +62,38 @@
<include refid="Base_Column_List" />
from ba_block
<trim prefix="where " suffixOverrides="and">
- <if test="name != null">
- name like '%#{name,jdbcType=VARCHAR}%' and
+ deleted = 0 and
+ <if test="name != null and name != ''">
+ name like concat('%', #{name}, '%') and
</if>
- <if test="header != null">
- header = '#{header,jdbcType=VARCHAR}' and
+ <if test="header != null and header != ''">
+ header = #{header,jdbcType=VARCHAR} and
</if>
- <if test="phone != null">
- phone = '#{phone,jdbcType=VARCHAR}' and
+ <if test="phone != null and phone != ''">
+ phone = #{phone,jdbcType=VARCHAR} and
</if>
<if test="area != null">
- area = #{area,jdbcType=INTEGER} and
+ area = ${area} and
</if>
</trim>
order by id DESC
<trim prefix="limit " >
<if test="start != null and count != null">
- #{start}, #{count}
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
</if>
</trim>
</select>
- <insert id="insert" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
+ <insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
<!--@mbg.generated-->
- insert into ba_block (id, `name`, `header`, phone, area, color, deleted)
+ insert into ba_block (id, `name`, `header`, phone, area, color, remark, deleted)
values (#{id,jdbcType=BIGINT},
#{name,jdbcType=VARCHAR},
#{header,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR},
#{area,jdbcType=INTEGER},
#{color,jdbcType=VARCHAR},
+ #{remark,jdbcType=VARCHAR},
#{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.dy.pipIrrGlobal.pojoBa.BaBlock">
@@ -102,6 +118,9 @@
<if test="color != null">
color,
</if>
+ <if test="remark != null">
+ remark,
+ </if>
<if test="deleted != null">
deleted,
</if>
@@ -124,6 +143,9 @@
</if>
<if test="color != null">
#{color,jdbcType=VARCHAR},
+ </if>
+ <if test="remark != null">
+ #{remark,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
#{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -149,8 +171,11 @@
<if test="color != null">
color = #{color,jdbcType=VARCHAR},
</if>
+ <if test="remark != null">
+ remark = #{remark,jdbcType=VARCHAR},
+ </if>
<if test="deleted != null">
- color = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
+ deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
@@ -163,6 +188,7 @@
phone = #{phone,jdbcType=VARCHAR},
area = #{area,jdbcType=INTEGER},
color = #{color,jdbcType=VARCHAR},
+ remark = #{remark,jdbcType=VARCHAR},
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0