From 4cc49c9ca4b0944b858f34f10bf62280377ff8ae Mon Sep 17 00:00:00 2001
From: jiyufei <67400194@qq.com>
Date: Mon, 8 Jul 2024 16:04:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(device):=E6=9F=A5=E8=AF=A2=E9=99=84?=
 =?UTF-8?q?=E8=BF=91=E4=BA=94=E5=85=AC=E9=87=8C=E5=86=85=E7=9A=84=E6=8A=95?=
 =?UTF-8?q?=E9=80=92=E6=9F=9C=E6=8E=A5=E5=8F=A3;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cc/yunxi/controller/DeviceController.java     | 2 +-
 .../src/main/java/cc/yunxi/service/IRecycleBucketService.java   | 1 +
 .../src/main/java/cc/yunxi/service/IRecycleDeviceService.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
index 3cee207..c615a33 100644
--- a/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
+++ b/nxhs-service/src/main/java/cc/yunxi/controller/DeviceController.java
@@ -884,12 +884,12 @@ public class DeviceController {
             return CommonResult.success(bean);
         }
     }
+
     @ApiOperation("附近的投递柜")
     @GetMapping("/nearby")
     public CommonResult<List<DeviceLocationVO>> stationNearby(@Valid LocationDTO location) {
         return CommonResult.success(deviceService.getNearby(location));
     }
-}
 
     @PostMapping("/exitControl")
     @ApiOperation("小程序接口 结束控制")
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java
index 5904e1e..6020dcf 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleBucketService.java
@@ -5,6 +5,7 @@ import cc.yunxi.domain.vo.device.BagCodeReqVO;
 import cc.yunxi.domain.vo.device.BucketStatus;
 import com.baomidou.mybatisplus.extension.service.IService;
 import javax.validation.constraints.NotBlank;
+import java.util.Collection;
 import java.util.List;
 
 public interface IRecycleBucketService extends IService<RecycleBucket> {
diff --git a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeviceService.java b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeviceService.java
index 06e83e7..29729ee 100644
--- a/nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeviceService.java
+++ b/nxhs-service/src/main/java/cc/yunxi/service/IRecycleDeviceService.java
@@ -21,7 +21,7 @@ public interface IRecycleDeviceService extends IService<RecycleDevice> {
     boolean online(String deviceCode);
 
 //    boolean isChanged(DeviceStatus old, DeviceStatus now);
-    boolean isChanged(DeviceStatus old, DeviceStatus now);
+//    boolean isChanged(DeviceStatus old, DeviceStatus now);
 
     /**
      * 获取附近五公里内的投递柜