From 93cecfaf0fae080ebd0212adea714726290d0d4a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 01 八月 2024 20:36:54 +0800
Subject: [PATCH] 电磁锁串口协议发送加入线程排队提交
---
ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
index 768041d..ef81f55 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockMapper.xml
@@ -170,7 +170,8 @@
case atls.lock_state
when '鍏抽攣鐘舵��' then false
when '寮傚父鐘舵��' then false
- when '鍔ㄤ綔鐘舵��' then false
+ /*when '鍔ㄤ綔鐘舵��' then false*/
+ when '鎿嶆帶涓�...' then false
when '寮�閿佺姸鎬�' then true
else false
end as lock_state_mark,
@@ -240,4 +241,34 @@
atlp.create_time,atlp.use_time from ard_tank_lock atl
left join ard_tank_lock_password atlp on atl.id = atlp.lock_id and use_time is null
</select>
+
+ <select id="getArdTankLockAllWithState" resultMap="ArdTankLockWithStateResult" >
+ select t.id,t.lock_num,t.lock_name,t.img_position_top,t.img_position_left,
+ t.car_id,t.enable,t.restart_state,t.online_time,t.sid,t.lock_id,t.slock_num,
+ t.lock_state,t.lock_position_state,t.lock_shell_state,t.srestart_state,
+ t.batter_voltage,t.power_voltage,t.upload_time,t.unique_mark,
+ t.lock_state_mark from (select atl.id,atl.lock_num,atl.lock_name,atl.img_position_top,
+ atl.img_position_left,atl.car_id,atl.enable,atl.restart_state,
+ coalesce(atl.online_time,'') as online_time,coalesce(atls.id,'') as sid,
+ coalesce(atls.lock_id,'') as lock_id,coalesce(atls.lock_num,'') as slock_num,
+ coalesce(atls.lock_state,'') as lock_state,coalesce(atls.lock_position_state,'') as lock_position_state,
+ coalesce(atls.lock_shell_state,'') as lock_shell_state,coalesce(atls.restart_state,'') as srestart_state,
+ coalesce(atls.batter_voltage,'') as batter_voltage,coalesce(atls.power_voltage,'') as power_voltage,
+ coalesce(atls.upload_time,'') as upload_time,coalesce(atls.unique_mark,'') as unique_mark,
+ case atls.lock_state
+ when '鍏抽攣鐘舵��' then false
+ when '寮傚父鐘舵��' then false
+ /*when '鍔ㄤ綔鐘舵��' then false*/
+ when '鎿嶆帶涓�...' then false
+ when '寮�閿佺姸鎬�' then true
+ else false
+ end as lock_state_mark,
+ rank() over(partition by atl.lock_num order by atls.upload_time desc,atl.lock_num) rn
+ from ard_tank_lock atl
+ left join ard_tank_lock_state atls on atl."id" = atls.lock_id)t where t.rn = 1
+ </select>
+
+ <select id="getArdTankLockCount" resultType="java.lang.Long" >
+ select count(*) from ard_tank_lock
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3