设备列表

server-module/src/main/java/com/makeit/module/controller/space/PlatRoomBedDeviceController.java

@@ -37,7 +37,7 @@ public class PlatRoomBedDeviceController {
     @ApiOperation("设备列表（选择设备)-房间绑定")
     @ApiOperation("设备列表（选择设备)-房间绑定")
     @PostMapping("pageRoomDevice")
     @PostMapping("pageRoomDevice")
     public ApiResponseEntity<PageVO<PlatDeviceDTO>> pageRoomDevice(@RequestBody PageReqDTO<PlatSpaceDeviceQueryDTO> page) {
     public ApiResponseEntity<PageVO<PlatDeviceDTO>> pageRoomDevice(@RequestBody PageReqDTO<PlatSpaceDeviceQueryDTO> page) {
-        //page.getData().setIsRoom(CommonEnum.YES.getValue());
+        page.getData().setIsRoom(CommonEnum.YES.getValue());
         PageVO<PlatDeviceDTO> data = platRoomBedDeviceService.pageDevice(page);
         PageVO<PlatDeviceDTO> data = platRoomBedDeviceService.pageDevice(page);
         return ApiResponseUtils.success(data);
         return ApiResponseUtils.success(data);
     }
     }

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatRoomBedDeviceServiceImpl.java

@@ -98,11 +98,9 @@ public class PlatRoomBedDeviceServiceImpl extends ServiceImpl<PlatRoomBedDeviceM
 
 
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<PlatRoomBedDevice> queryWrapper1 = new LambdaQueryWrapper<>();
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
         queryWrapper1.select(PlatRoomBedDevice::getDeviceId);
-        if (StringUtil.isNotEmpty(dto.getRoomId())) {
-            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
-        }
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
         if (CommonEnum.NO.getValue().equals(dto.getIsRoom())) {
             queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
             queryWrapper1.isNotNull(PlatRoomBedDevice::getBedId);
+            queryWrapper1.eq(PlatRoomBedDevice::getRoomId, dto.getRoomId());
         }
         }
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<PlatRoomBedDevice> list = list(queryWrapper1);
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());
         List<String> listEquipmentIds = list.stream().map(item -> item.getDeviceId()).collect(Collectors.toList());