From 56b6e1d795e9a4badee9229d8a6ccd6e0d56d4c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 04 七月 2024 10:22:25 +0800
Subject: [PATCH] 电磁锁电子围栏概要提交
---
ard-work/src/main/java/com/ruoyi/sy/domain/ArdTankWall.java | 46 ++++------------------
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java | 2
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java | 2
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 26 +++++--------
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankWallMapper.java | 2
5 files changed, 22 insertions(+), 56 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 54aa1b8..3a2b293 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-01
+ * @date 2024-07-04
*/
public class ArdTankWall extends BaseEntity
{
@@ -22,17 +22,9 @@
@Excel(name = "鐢靛瓙鍥存爮鍚嶇О")
private String wallName;
- /** 缁忓害 */
- @Excel(name = "缁忓害")
- private Double longitude;
-
- /** 绾害 */
- @Excel(name = "绾害")
- private Double latitude;
-
- /** 璺濈 */
- @Excel(name = "璺濈")
- private Integer distance;
+ /** 鐢靛瓙鍥存爮鑼冨洿 */
+ @Excel(name = "鐢靛瓙鍥存爮鑼冨洿")
+ private String wallPoi;
public void setId(String id)
{
@@ -52,32 +44,14 @@
{
return wallName;
}
- public void setLongitude(Double longitude)
+ public void setWallPoi(String wallPoi)
{
- this.longitude = longitude;
+ this.wallPoi = wallPoi;
}
- public Double getLongitude()
+ public String getWallPoi()
{
- return longitude;
- }
- public void setLatitude(Double latitude)
- {
- this.latitude = latitude;
- }
-
- public Double getLatitude()
- {
- return latitude;
- }
- public void setDistance(Integer distance)
- {
- this.distance = distance;
- }
-
- public Integer getDistance()
- {
- return distance;
+ return wallPoi;
}
@Override
@@ -85,9 +59,7 @@
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("wallName", getWallName())
- .append("longitude", getLongitude())
- .append("latitude", getLatitude())
- .append("distance", getDistance())
+ .append("wallPoi", getWallPoi())
.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 1c40bf4..e213b13 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
@@ -7,7 +7,7 @@
* 鐢电閿佺數瀛愬洿鏍廙apper鎺ュ彛
*
* @author ard
- * @date 2024-07-01
+ * @date 2024-07-04
*/
public interface ArdTankWallMapper
{
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
index 7b3c852..97073e5 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankWallService.java
@@ -7,7 +7,7 @@
* 鐢电閿佺數瀛愬洿鏍廠ervice鎺ュ彛
*
* @author ard
- * @date 2024-07-01
+ * @date 2024-07-04
*/
public interface IArdTankWallService
{
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
index 109429c..f5fbc50 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankWallServiceImpl.java
@@ -19,7 +19,7 @@
* 鐢电閿佺數瀛愬洿鏍廠ervice涓氬姟灞傚鐞�
*
* @author ard
- * @date 2024-07-01
+ * @date 2024-07-04
*/
@Service
public class ArdTankWallServiceImpl implements IArdTankWallService {
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
index 504bdd9..67e4371 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -7,22 +7,18 @@
<resultMap type="ArdTankWall" id="ArdTankWallResult">
<result property="id" column="id" />
<result property="wallName" column="wall_name" />
- <result property="longitude" column="longitude" />
- <result property="latitude" column="latitude" />
- <result property="distance" column="distance" />
+ <result property="wallPoi" column="wall_poi" />
</resultMap>
<sql id="selectArdTankWallVo">
- select id, wall_name, longitude, latitude, distance from ard_tank_wall
+ select id, wall_name, wall_poi from ard_tank_wall
</sql>
<select id="selectArdTankWallList" parameterType="ArdTankWall" resultMap="ArdTankWallResult">
<include refid="selectArdTankWallVo"/>
<where>
<if test="wallName != null and wallName != ''"> and wall_name like '%'||#{wallName}||'%'</if>
- <if test="longitude != null "> and longitude = #{longitude}</if>
- <if test="latitude != null "> and latitude = #{latitude}</if>
- <if test="distance != null "> and distance = #{distance}</if>
+ <if test="wallPoi != null and wallPoi != ''"> and wall_poi = #{wallPoi}</if>
</where>
</select>
@@ -36,16 +32,12 @@
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="wallName != null">wall_name,</if>
- <if test="longitude != null">longitude,</if>
- <if test="latitude != null">latitude,</if>
- <if test="distance != null">distance,</if>
+ <if test="wallPoi != null">wall_poi,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
<if test="wallName != null">#{wallName},</if>
- <if test="longitude != null">#{longitude},</if>
- <if test="latitude != null">#{latitude},</if>
- <if test="distance != null">#{distance},</if>
+ <if test="wallPoi != null">#{wallPoi},</if>
</trim>
</insert>
@@ -53,9 +45,7 @@
update ard_tank_wall
<trim prefix="SET" suffixOverrides=",">
<if test="wallName != null">wall_name = #{wallName},</if>
- <if test="longitude != null">longitude = #{longitude},</if>
- <if test="latitude != null">latitude = #{latitude},</if>
- <if test="distance != null">distance = #{distance},</if>
+ <if test="wallPoi != null">wall_poi = #{wallPoi},</if>
</trim>
where id = #{id}
</update>
@@ -70,4 +60,8 @@
#{id}
</foreach>
</delete>
+
+ <select id="getAllArdTankWall" resultMap="ArdTankWallResult">
+ select * from ard_tank_wall order by wall_name
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3