From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-global/src/main/resources/mapper/BaUserMapper.xml | 18 ++++++++++++++----
1 files changed, 14 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 fa6d313..b8f7e0d 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
@@ -370,4 +370,14 @@
<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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0