From 7abb49419b6f02a961c8c85b27221b50c0b5c07d Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Wed, 12 Jun 2024 15:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meeting/RoomContentController.java | 15 +++++++-- .../main/java/com/ics/admin/domain/Room.java | 3 ++ .../ics/admin/domain/meeting/RoomRecord.java | 3 ++ .../impl/UserEquipmentServiceImpl.java | 5 +-- .../impl/meeting/ShowroomServiceImpl.java | 1 - .../meeting/ApiEquipmentController.java | 31 +++++++++++++------ 6 files changed, 43 insertions(+), 15 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java index 4a952ee..b481e89 100644 --- a/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java +++ b/ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java @@ -272,13 +272,22 @@ public class RoomContentController extends BaseController { room.setDeleteFlag(0); room.setBuildingDetailIds(room.getBuildingDetailIds()); List rooms = roomService.selectRoomList(room); - if (CollUtil.isNotEmpty(room.getIds()) ){ - for (Long id : room.getIds()) { - Room room1 = roomService.selectRoomById(id); + + + String customerId = room.getCustomerId(); + Customer customer = customerService.selectCustomerById(Long.valueOf(customerId)); + String roomId = customer.getRoomId(); + List roomIds = StrUtil.split(roomId, ','); + + + if (CollUtil.isNotEmpty(roomIds) ){ + for (String id : roomIds) { + Room room1 = roomService.selectRoomById(Long.valueOf(id)); if (null != room1){ rooms.add(room1); } } + } return R.ok().put("data",rooms); } diff --git a/ics-admin/src/main/java/com/ics/admin/domain/Room.java b/ics-admin/src/main/java/com/ics/admin/domain/Room.java index 145548e..ec7aa0f 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/Room.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/Room.java @@ -324,4 +324,7 @@ public class Room extends BaseEntity { @TableField(exist = false) private List ids; + @TableField(exist = false) + private String customerId; + } \ No newline at end of file diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomRecord.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomRecord.java index ece6e71..fd5d03f 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomRecord.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomRecord.java @@ -36,4 +36,7 @@ public class RoomRecord extends BaseEntity { private String type; + @TableField(exist = false) + private String equipmentType; + } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java index 8f239e8..d52563d 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java @@ -155,9 +155,10 @@ public class UserEquipmentServiceImpl extends ServiceImpl equipment = equipmentService.selectEquipmentList(new Equipment()); +// List equipment = equipmentService.selectEquipmentList(new Equipment()); - updateDeviceDataSource(equipment); + //todo 查看对应的设备的状态 +// updateDeviceDataSource(equipment); ArrayList equipments = new ArrayList<>(); diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java index b264a69..7a414dc 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java @@ -46,7 +46,6 @@ public class ShowroomServiceImpl extends ServiceImpl i queryWrapper.eq(showroom.getMeetingName() !=null,"meeting_name", showroom.getMeetingName()); queryWrapper.eq(showroom.getTenantId() !=null,"tenant_id", showroom.getTenantId()); queryWrapper.eq(showroom.getRoomId() !=null,"room_id", showroom.getRoomId()); - queryWrapper.eq("is_show",0); queryWrapper.in(showroom.getRoomIds() !=null,"room_id", showroom.getRoomIds()); return showroomMapper.selectList(queryWrapper); diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java index 5679737..4bb63c5 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java @@ -167,18 +167,31 @@ public class ApiEquipmentController extends BaseController { @GetMapping("/scanOpenDoor") public R scanOpenDoor( RoomRecord roomRecord){ -// long currentUserId = getCurrentUserId(); -// roomRecord.setUserId(currentUserId); - // 对比personId 和用户 id， - // 对比equipmentId 和设备id -// log.info("ip地址为{}",ip); + log.info("用户id为{}",roomRecord.getUserId()); log.info("房间id为{}",roomRecord.getRoomId()); -// String ip = equipmentService.selectEquipmentById(roomRecord.getDeviceId()).getIp(); -// log.info("ip地址为{}",ip); -// log.info("用户id为{}",roomRecord.getUserId()); -// log.info("房间id为{}",roomRecord.getRoomId()); + if (roomRecord.getEquipmentType().equals("displayScreen")){ + Long deviceId = roomRecord.getDeviceId(); + Long userId = roomRecord.getUserId(); + UserEquipment userEquipment = userEquipmentService.selectUserAndEquipment(userId, deviceId); + if (null == userEquipment){ + return R.error("您没有该设备的权限"); + } + + String ip = equipmentService.selectEquipmentById(roomRecord.getDeviceId()).getIp(); + + + + + String openlock = DeviceUtils.openlock(ip); + JSONObject jsonObject = JSONUtil.parseObj(openlock); + Integer code = (Integer) jsonObject.get("status"); + Assert.isTrue(code == 0,"开门失败"); + + int i = roomRecordService.insertRoomRecord(roomRecord); + Assert.isTrue(i == 1,"开门失败"); + } // String openlock = DeviceUtils.openlock(ip); // JSONObject jsonObject = JSONUtil.parseObj(openlock);