From c3ec70d2bd1ebd2421d2fa3e85c1ac43e2322ea6 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 22 七月 2024 14:44:52 +0800
Subject: [PATCH] 电子围栏加入类型提交
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java | 16 +++++++++++++++-
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 16 ++++++++++------
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java | 4 +---
3 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java
index 3a2b293..1ce5d12 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java
@@ -9,7 +9,7 @@
* 鐢电閿佺數瀛愬洿鏍忓璞� ard_tank_wall
*
* @author ard
- * @date 2024-07-04
+ * @date 2024-07-22
*/
public class ArdTankWall extends BaseEntity
{
@@ -25,6 +25,10 @@
/** 鐢靛瓙鍥存爮鑼冨洿 */
@Excel(name = "鐢靛瓙鍥存爮鑼冨洿")
private String wallPoi;
+
+ /** 鐢靛瓙鍥存爮绫诲瀷 */
+ @Excel(name = "鐢靛瓙鍥存爮绫诲瀷")
+ private String wallType;
public void setId(String id)
{
@@ -53,6 +57,15 @@
{
return wallPoi;
}
+ public void setWallType(String wallType)
+ {
+ this.wallType = wallType;
+ }
+
+ public String getWallType()
+ {
+ return wallType;
+ }
@Override
public String toString() {
@@ -60,6 +73,7 @@
.append("id", getId())
.append("wallName", getWallName())
.append("wallPoi", getWallPoi())
+ .append("wallType", getWallType())
.toString();
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
index c88f8a1..c473eab 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java
@@ -9,7 +9,7 @@
* 鐢电閿佺數瀛愬洿鏍廙apper鎺ュ彛
*
* @author ard
- * @date 2024-07-04
+ * @date 2024-07-22
*/
public interface ArdTankWallMapper
{
@@ -68,8 +68,6 @@
public Long selectArdTankWallTotal(String wallName);
public List<ArdTankWall> getDistinctArdTankWallByCarId(String carId);
-
- public int deleteArdTankAbnormalParkAlarmByCarId(String carId);
public List<ArdTankWall> getArdTankWallProcessByLockId(String lockId);
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
index d582bc2..74a49be 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -8,10 +8,11 @@
<result property="id" column="id" />
<result property="wallName" column="wall_name" />
<result property="wallPoi" column="wall_poi" />
+ <result property="wallType" column="wall_type" />
</resultMap>
<sql id="selectArdTankWallVo">
- select id, wall_name, wall_poi from ard_tank_wall
+ select id, wall_name, wall_poi, wall_type from ard_tank_wall
</sql>
<select id="selectArdTankWallList" parameterType="ArdTankWall" resultMap="ArdTankWallResult">
@@ -19,8 +20,8 @@
<where>
<if test="wallName != null and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
<if test="wallPoi != null and wallPoi != ''"> and wall_poi = #{wallPoi}</if>
+ <if test="wallType != null and wallType != ''"> and wall_type = #{wallType}</if>
</where>
- order by wall_name
</select>
<select id="selectArdTankWallById" parameterType="String" resultMap="ArdTankWallResult">
@@ -34,11 +35,13 @@
<if test="id != null">id,</if>
<if test="wallName != null">wall_name,</if>
<if test="wallPoi != null">wall_poi,</if>
+ <if test="wallType != null">wall_type,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="wallName != null">#{wallName},</if>
<if test="wallPoi != null">#{wallPoi},</if>
+ <if test="wallType != null">#{wallType},</if>
</trim>
</insert>
@@ -47,6 +50,7 @@
<trim prefix="SET" suffixOverrides=",">
<if test="wallName != null">wall_name = #{wallName},</if>
<if test="wallPoi != null">wall_poi = #{wallPoi},</if>
+ <if test="wallType != null">wall_type = #{wallType},</if>
</trim>
where id = #{id}
</update>
@@ -83,10 +87,10 @@
</select>
<select id="getDistinctArdTankWallByCarId" resultMap="ArdTankWallResult" parameterType="java.lang.String">
- select distinct atw.* from ard_tank_lock atl
- inner join ard_tank_wall_lock atwl on atl.id = atwl.lock_id
- inner join ard_tank_wall atw on atwl.wall_id = atw.id
- where atl.car_id = #{carId}
+ select distinct atw.* from ard_tank_lock atl
+ inner join ard_tank_wall_lock atwl on atl.id = atwl.lock_id
+ inner join ard_tank_wall atw on atwl.wall_id = atw.id
+ where atl.car_id = #{carId}
</select>
<select id="getArdTankWallProcessByLockId" resultMap="ArdTankWallResult" parameterType="java.lang.String">
--
Gitblit v1.9.3