From 80aace69506a46f93519fa583d8c04ab861498d2 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期五, 02 八月 2024 23:05:23 +0800
Subject: [PATCH] 电磁锁临时电子围栏加入服务器重启生效创建提交
---
ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
index 91ddecb..45b960c 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallTemporaryMapper.xml
@@ -110,7 +110,7 @@
</foreach>
</delete>
- <select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryMarkResult">
+ <!--<select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryMarkResult">
select atwt.*,case process_mark
when '1' then 1
when '0' then 2
@@ -120,13 +120,41 @@
inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
where "asc".car_id = #{carId} order by mark asc,process_time desc
+ </select>-->
+
+ <select id="getArdTankWallTemporaryByCarId" parameterType="java.lang.String" resultMap="ArdTankWallTemporaryResult">
+ select atwt.* from ard_sy_car "asc"
+ inner join ard_tank_lock atl on "asc".car_id = atl.car_id
+ inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
+ inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
+ where "asc".car_id = #{carId} and atwt.process_mark = '1' order by process_time desc
</select>
+
+ <!--<select id="selectArdTankWallTemporaryTotalByCarId" parameterType="java.lang.String" resultType="java.lang.Long">
+ select count(distinct atwt.*) from ard_sy_car "asc"
+ inner join ard_tank_lock atl on "asc".car_id = atl.car_id
+ inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
+ inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
+ where "asc".car_id = #{carId}
+ </select>-->
<select id="selectArdTankWallTemporaryTotalByCarId" parameterType="java.lang.String" resultType="java.lang.Long">
select count(distinct atwt.*) from ard_sy_car "asc"
inner join ard_tank_lock atl on "asc".car_id = atl.car_id
inner join ard_tank_wall_lock_temporary atwlt on atl."id" = atwlt.lock_id
inner join ard_tank_wall_temporary atwt on atwlt.wall_id = atwt."id"
- where "asc".car_id = #{carId}
+ where "asc".car_id = #{carId} and atwt.process_mark = '1'
+ </select>
+
+ <select id="getAliveArdTankWallTemporaryWithCarId" resultType="java.util.Map">
+ select distinct atwt."id",atwt.wall_name as "wallName",
+ atwt.longitude,atwt.latitude,atwt.distance,atwt."interval",
+ atwt.process_time as "processTime",atwt.process_mark as "processMark",
+ atwt.user_id as "userId",atwt.user_name as "userName",
+ "asy".car_id as "carId" from ard_tank_wall_temporary atwt
+ inner join ard_tank_wall_lock_temporary atwlt on atwt."id" = atwlt.wall_id
+ inner join ard_tank_lock atl on atwlt.lock_id = atl."id"
+ inner join ard_sy_car "asy" on atl.car_id = "asy".car_id
+ where atwt.process_mark = '1'
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3