From 106aa7f35e8db46c8841f95365c1908748aa8a03 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Thu, 25 Jan 2024 19:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A9=E5=8F=B7id=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/zc/business/domain/DcStakeMark.java | 4 ++--
 .../com/zc/business/service/impl/DcDeviceServiceImpl.java | 2 +-
 .../zc/business/service/impl/DcStakeMarkServiceImpl.java  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcStakeMark.java b/zc-business/src/main/java/com/zc/business/domain/DcStakeMark.java
index f69b5840..123c57cd 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcStakeMark.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcStakeMark.java
@@ -13,8 +13,8 @@ public class DcStakeMark {
     public static final String UP = "1";
     public static final String CENTRE = "2";
     public static final String DOWN = "3";
-    @ApiModelProperty("ID")
-    private String id;
+    @ApiModelProperty("桩号")
+    private String stakeMark;
     @ApiModelProperty("经度")
     private String longitude;
     @ApiModelProperty("纬度")
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
index 0bc79af1..285cc341 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcDeviceServiceImpl.java
@@ -281,7 +281,7 @@ public class DcDeviceServiceImpl extends ServiceImpl<DcDeviceMapper, DcDevice> i
     public DcStakeMark exampleQueryTheAssociatedPileNumber(DcDevice dcDevice) {
         DcStakeMark dcStakeMark = new DcStakeMark();
         dcStakeMark.setDirection(dcDevice.getDirection());
-        dcStakeMark.setId(dcDevice.getStakeMark());
+        dcStakeMark.setStakeMark(dcDevice.getStakeMark());
         List<DcStakeMark> dcStakeMarks = dcStakeMarkService.listStakeMark(dcStakeMark);
         if (dcStakeMarks.size() == 1) {
             return dcStakeMarks.get(0);
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcStakeMarkServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcStakeMarkServiceImpl.java
index ecaec4dd..3dacb227 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcStakeMarkServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcStakeMarkServiceImpl.java
@@ -29,8 +29,8 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
         LambdaQueryWrapper<DcStakeMark> queryWrapper = new LambdaQueryWrapper<>();
 
         // 设备ID
-        if (StringUtils.hasText(dcStakeMark.getId())) {
-            queryWrapper.eq(DcStakeMark::getId, dcStakeMark.getId());
+        if (StringUtils.hasText(dcStakeMark.getStakeMark())) {
+            queryWrapper.eq(DcStakeMark::getStakeMark, dcStakeMark.getStakeMark());
         }
 
         // 经度
@@ -69,7 +69,7 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
     @Override
     public boolean addStakeMark(DcStakeMark dcStakeMark) {
 
-        String id = dcStakeMark.getId();
+        String id = dcStakeMark.getStakeMark();
         if (Objects.nonNull(id)) {
             DcStakeMark device = getById(id);
             if (Objects.nonNull(device)) {
@@ -84,7 +84,7 @@ public class DcStakeMarkServiceImpl extends ServiceImpl<DcStakeMarkMapper, DcSta
     @Override
     public boolean editStakeMark(DcStakeMark dcStakeMark) {
 
-        String id = dcStakeMark.getId();
+        String id = dcStakeMark.getStakeMark();
 
         // 检查设备id是否重复
         DcStakeMark product = getById(id);