zhaoSecond

springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java

@@ -66,9 +66,9 @@ public class DeviceController extends BaseController
     @PreAuthorize("@ss.hasPermi('iot:device:list')")
     @GetMapping("/all")
     @ApiOperation("查询所有设备简短列表")
-    public TableDataInfo allShortList()
+    public TableDataInfo allShortList(Device device)
     {
-        List<DeviceAllShortOutput> list = deviceService.selectAllDeviceShortList();
+        List<DeviceAllShortOutput> list = deviceService.selectAllDeviceShortList1(device.getUserName());
         return getDataTable(list);
     }
 

springboot/wumei-iot/src/main/java/com/ruoyi/iot/mapper/DeviceMapper.java

@@ -161,4 +161,6 @@ public interface DeviceMapper
      * @return
      */
     public int deleteDeviceGroupByDeviceIds(Long[] deviceIds);
+//    查询简短设备列表
+    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
 }

springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/IDeviceService.java

@@ -151,4 +151,7 @@ public interface IDeviceService
      * @return 结果
      */
     public String generationDeviceNum();
+
+    //    获取所有简短设备列表
+    List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName);
 }

springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java

@@ -534,6 +534,12 @@ public class DeviceServiceImpl implements IDeviceService {
         return "";
     }
 
+    @Override
+    public List<DeviceAllShortOutput> selectAllDeviceShortList1(String userName) {
+        return deviceMapper.selectAllDeviceShortList1(userName);
+    }
+
+
     /**
      *
      * @param device 设备