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/BaUserMapper.xml | 79 ++++++++++++++++++++++++---------------
1 files changed, 48 insertions(+), 31 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
index c49501a..a07541e 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -8,20 +8,22 @@
<!--@Table ba_user-->
<id property="id" column="id" />
<result property="blockId" column="blockId"/>
- <result property="name" column="name"/>
+ <result property="userName" column="name"/>
<result property="phone" column="phone"/>
<result property="password" column="password"/>
<result property="orgTag" column="orgTag"/>
<result property="supperAdmin" column="supperAdmin"/>
- <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Disabled"/>
- <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler" javaType="com.dy.common.mybatis.envm.Deleted"/>
+ <result property="disabled" column="disabled" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Disabled"/>
+ <result property="deleted" column="deleted" typeHandler="com.dy.common.mybatis.envm.EnumCodeTypeHandler"
+ javaType="com.dy.common.mybatis.envm.Deleted"/>
</resultMap>
<resultMap id="partResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
<!--@mbg.generated-->
<!--@Table ba_user-->
<id property="id" column="id" />
- <result property="name" column="name"/>
+ <result property="userName" column="name"/>
<result property="phone" column="phone"/>
<result property="orgTag" column="orgTag"/>
<result property="supperAdmin" column="supperAdmin"/>
@@ -31,7 +33,7 @@
<resultMap id="loginResultMap" type="com.dy.pipIrrGlobal.pojoBa.BaUser">
<id property="id" column="id" />
<result property="blockId" column="blockId"/>
- <result property="name" column="name"/>
+ <result property="userName" column="name"/>
<result property="phone" column="phone"/>
<result property="orgTag" column="orgTag"/>
<result property="supperAdmin" column="supperAdmin"/>
@@ -99,10 +101,11 @@
</trim>
</select>
<insert id="putin" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
- insert into ba_user (<include refid="Base_Column_List" />)
+<!-- insert into ba_user (<include refid="Base_Column_List" />)-->
+ insert into ba_user(id, blockId, name, phone, password, orgTag, supperAdmin, disabled, deleted)
values (#{id,jdbcType=BIGINT},
#{blockId,jdbcType=BIGINT},
- #{name,jdbcType=VARCHAR},
+ #{userName,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR},
#{password,jdbcType=VARCHAR},
#{orgTag,jdbcType=VARCHAR},
@@ -120,7 +123,7 @@
<if test="blockId != null">
blockId,
</if>
- <if test="name != null">
+ <if test="userName != null">
`name`,
</if>
<if test="phone != null">
@@ -149,8 +152,8 @@
<if test="blockId != null">
#{blockId,jdbcType=BIGINT},
</if>
- <if test="name != null">
- #{name,jdbcType=VARCHAR},
+ <if test="userName != null">
+ #{userName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
#{phone,jdbcType=VARCHAR},
@@ -179,8 +182,8 @@
<if test="blockId != null">
blockId = #{blockId,jdbcType=BIGINT},
</if>
- <if test="name != null">
- `name` = #{name,jdbcType=VARCHAR},
+ <if test="userName != null">
+ `name` = #{userName,jdbcType=VARCHAR},
</if>
<if test="phone != null">
phone = #{phone,jdbcType=VARCHAR},
@@ -195,12 +198,12 @@
deleted = #{deleted,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
</if>
</set>
- where id = #{id,jdbcType=BIGINT}
+ where id = #{id, jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.dy.pipIrrGlobal.pojoBa.BaUser">
update ba_user
set blockId = #{blockId,jdbcType=BIGINT},
- `name` = #{name,jdbcType=VARCHAR},
+ `name` = #{userName,jdbcType=VARCHAR},
phone = #{phone,jdbcType=VARCHAR},
password = #{password,jdbcType=VARCHAR},
disabled = #{disabled,typeHandler=com.dy.common.mybatis.envm.EnumCodeTypeHandler, jdbcType=TINYINT},
@@ -245,14 +248,18 @@
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鐢ㄦ埛淇℃伅-->
<select id="getUserInfoById" resultType="java.util.Map">
SELECT
- id AS userId,
- name AS userName
- FROM ba_user
+ us.id AS userId,
+ us.name AS userName,
+ us.phone,
+ IFNULL(us.blockId, 0) AS blockId,
+ IFNULL(blo.name, 0) AS blockName
+ FROM ba_user us
+ LEFT JOIN ba_block blo ON us.blockId = blo.id
<where>
- AND disabled = 0
- AND deleted = 0
+ AND us.disabled = 0
+ AND us.deleted = 0
<if test = "userId != null and userId > 0">
- AND ba_user.id = ${userId}
+ AND us.id = ${userId}
</if>
</where>
</select>
@@ -262,13 +269,13 @@
SELECT
COUNT(*) AS recordCount
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -284,7 +291,7 @@
<!--鏍规嵁鎸囧畾鏉′欢鑾峰彇鐢ㄦ埛鍒楄〃-->
<select id="getUsers" resultType="com.dy.pipIrrGlobal.voBa.VoUserInfo">
SELECT
- id AS userId,
+ CAST(id AS char) AS id,
phone,
name AS userName,
disabled AS stateId,
@@ -292,16 +299,16 @@
WHEN disabled = 0 THEN "姝ｅ父"
WHEN disabled = 1 THEN "宸茬鐢�"
END) AS stateName,
- blockId,
+ CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
FROM ba_user user
- INNER JOIN ba_user_role usro ON usro.userId = user.id
+<!-- INNER JOIN ba_user_role usro ON usro.userId = user.id-->
<where>
AND user.supperAdmin != 1
AND user.deleted = 0
- <if test = "name != null and name !=''">
- AND user.name like CONCAT('%',#{name},'%')
+ <if test = "userName != null and userName !=''">
+ AND user.name like CONCAT('%',#{userName},'%')
</if>
<if test = "phone != null and phone !=''">
@@ -313,9 +320,11 @@
</if>
</where>
ORDER BY user.id DESC
- <if test="pageCurr != null and pageSize != null">
- LIMIT ${pageCurr}, ${pageSize}
- </if>
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
</select>
<!--鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇瑙掕壊ID鍒楄〃-->
@@ -334,4 +343,12 @@
WHERE userId = ${userId}
</select>
+
+ <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+ <!--@mbg.generated-->
+ select
+ <include refid="Base_Column_List" />
+ from ba_user
+ where id = #{id,jdbcType=BIGINT}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0