diff --git a/AutoSprout-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/AutoSprout-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index b70cc93..bcefdf6 100644
--- a/AutoSprout-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/AutoSprout-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -90,7 +90,7 @@ public class SysLoginController
     public AjaxResult getAppInfo()
     {
         AsUser user = SecurityUtils.getLoginUser().getAsUser();
-        user.setDeviceId(asUserService.selectDeviceInfoByUser(user.getUserId()).getDeviceId());
+        user.setDeviceId(asUserService.selectDeviceInfoByUser(user.getUserId(),null).get(0).getDeviceId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         return ajax;
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
index 9f83e54..ce2a68d 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
@@ -5,6 +5,7 @@ import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.device.domain.AsDevice;
 import com.ruoyi.device.domain.AsDeviceVersion;
 import com.ruoyi.device.domain.AsWateringRecord;
@@ -44,9 +45,14 @@ public class AppController extends BaseController
      * 根据登录用户获取绑定设备
      */
     @GetMapping("/getDeviceInfoByUser")
-    public AjaxResult list(Long userId)
+    public AjaxResult list(Long userId,String deviceId)
     {
-        AsDevice device = asUserService.selectDeviceInfoByUser(userId);
+        List<AsDevice> device;
+        if(StringUtils.isEmpty(deviceId) || "null".equals(deviceId)){
+            device = asUserService.selectDeviceInfoByUser(userId,null);
+        }else{
+            device = asUserService.selectDeviceInfoByUser(userId,Long.parseLong(deviceId));
+        }
         return AjaxResult.success(device);
     }
 
@@ -92,4 +98,23 @@ public class AppController extends BaseController
     {
         return toAjax(asDeviceService.updateAsDevice(asDevice));
     }
+
+    /**
+     * 获取设备列表详细信息
+     */
+    @GetMapping(value = "/getDeviceInfo/{deviceId}")
+    public AjaxResult getInfo(@PathVariable("deviceId") Long deviceId)
+    {
+        return success(asDeviceService.selectAsDeviceByDeviceId(deviceId));
+    }
+
+    /**
+     * 删除设备列表
+     */
+    @Log(title = "设备列表", businessType = BusinessType.DELETE)
+    @DeleteMapping("/device/{deviceIds}")
+    public AjaxResult remove(@PathVariable Long[] deviceIds)
+    {
+        return toAjax(asDeviceService.deleteAsDeviceByDeviceIds(deviceIds));
+    }
 }
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsUserService.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsUserService.java
index 87c9a4e..b55b08a 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsUserService.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsUserService.java
@@ -181,5 +181,5 @@ public interface IAsUserService
     /**
      * 根据登录用户获取是否有绑定设备
      */
-    AsDevice selectDeviceInfoByUser(Long userId);
+    List<AsDevice> selectDeviceInfoByUser(Long userId,Long deviceId);
 }
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsUserServiceImpl.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsUserServiceImpl.java
index ae1ce4d..f67d132 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsUserServiceImpl.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsUserServiceImpl.java
@@ -393,15 +393,15 @@ public class AsUserServiceImpl implements IAsUserService
      * @return 用户设备信息
      */
     @Override
-    public AsDevice selectDeviceInfoByUser(Long userId) {
-        AsDevice asDevice = AsDevice.builder().userId(userId).build();
+    public List<AsDevice> selectDeviceInfoByUser(Long userId,Long deviceId) {
+        AsDevice asDevice = AsDevice.builder().userId(userId).deviceId(deviceId).build();
         List<AsDevice> asDevices = asDeviceMapper.selectAsDeviceList(asDevice);
-        if(ObjectUtils.isNotEmpty(asDevices) && asDevices.size() !=0 ){
-            AsDevice device = asDevices.get(0);
-            //请求
-
-            return device;
-        }
-        return null;
+//        if(ObjectUtils.isNotEmpty(asDevices) && asDevices.size() !=0 ){
+//            AsDevice device = asDevices.get(0);
+//            //请求
+//
+//            return device;
+//        }
+        return asDevices;
     }
 }
diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
index d5b83c5..2e7d2b7 100644
--- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="onlineStatus != null  and onlineStatus != ''"> and online_status = #{onlineStatus}</if>
             <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
             <if test="userId != null "> and user_id = #{userId}</if>
+            <if test="deviceId != null "> and device_id != #{deviceId}</if>
         </where>
     </select>