From c7c8554e2b9809bc90ac4a43fdaa39dfe16f4ab0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 09 五月 2025 14:09:32 +0800
Subject: [PATCH] “远程测控”功能返回数据中增加protocol和protocolVersion属性，以备前端做多协议兼容。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 dcb0b69..e83dd19 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml
@@ -276,8 +276,8 @@
name AS userName,
disabled AS stateId,
(CASE
- WHEN disabled = 0 THEN "姝ｅ父"
- WHEN disabled = 1 THEN "宸茬鐢�"
+ WHEN disabled = 0 THEN '姝ｅ父'
+ WHEN disabled = 1 THEN '宸茬鐢�'
END) AS stateName,
CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
@@ -310,8 +310,8 @@
name AS userName,
disabled AS stateId,
(CASE
- WHEN disabled = 0 THEN "姝ｅ父"
- WHEN disabled = 1 THEN "宸茬鐢�"
+ WHEN disabled = 0 THEN '姝ｅ父'
+ WHEN disabled = 1 THEN '宸茬鐢�'
END) AS stateName,
CAST(blockId AS char) AS blockId,
(SELECT name FROM ba_block WHERE id = user.blockId) AS blockName
@@ -366,4 +366,48 @@
from ba_user
where id = #{id,jdbcType=BIGINT}
</select>
+
+ <!--鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栫敤鎴疯褰曟暟-->
+ <select id="countPhone" resultType="java.lang.Long">
+ SELECT
+ COUNT(*) AS recordCount
+ FROM ba_user user
+ <where>
+ user.deleted = 0
+ <if test = "phone != null and phone !=''">
+ AND user.phone= #{phone}
+ </if>
+ </where>
+ </select>
+
+ <select id="getPhones" resultType="java.lang.String">
+ SELECT phone FROM ba_user WHERE deleted = 0 and disabled = 0
+ </select>
+
+ <!--鑾峰彇绠�鍗曠敤鎴锋暟鎹垪琛�-->
+ <select id="getSimpleUsers" resultType="com.dy.pipIrrGlobal.voBa.VoSimpleUser">
+ SELECT
+ id AS userId,
+ name AS userName
+ FROM ba_user
+ WHERE disabled = 0 AND deleted = 0
+ </select>
+
+ <!--鑾峰彇宸℃鍛樺垪琛�-->
+ <select id="getInspectors" resultType="com.dy.pipIrrGlobal.voBa.VoRoleSimple">
+ SELECT
+ us.id AS inspectorId,
+ us.name AS inspector
+ FROM ba_user us
+ INNER JOIN ba_user_role ur ON ur.userId = us.id
+ INNER JOIN ba_role rol ON rol.id = ur.roleId
+ <where>
+ AND us.disabled = 0
+ AND us.deleted = 0
+ AND rol.`name` = '宸℃鍛�'
+ <if test = "inspector != null and inspector !=''">
+ AND us.name LIKE CONCAT('%',#{inspector},'%')
+ </if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0