boyue2025/xiongan-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/xiongan-meeting.git synced 2025-06-21 11:59:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了对应企业的bug

Browse Source
This commit is contained in:
chendaze 2024-06-12 15:48:10 +08:00
parent d35bfa64e3
commit 7abb49419b
6 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ics-admin/src/main/java/com/ics/admin/controller/meeting/RoomContentController.java
View File

@ -272,13 +272,22 @@ public class RoomContentController extends BaseController {
room.setDeleteFlag(0); room.setDeleteFlag(0);
room.setBuildingDetailIds(room.getBuildingDetailIds()); room.setBuildingDetailIds(room.getBuildingDetailIds());
List<Room> rooms = roomService.selectRoomList(room); List<Room> 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<String> roomIds = StrUtil.split(roomId, ',');
if (CollUtil.isNotEmpty(roomIds) ){
for (String id : roomIds) {
Room room1 = roomService.selectRoomById(Long.valueOf(id));
if (null != room1){ if (null != room1){
rooms.add(room1); rooms.add(room1);
} }
} }
} }
return R.ok().put("data",rooms); return R.ok().put("data",rooms);
} }

3
ics-admin/src/main/java/com/ics/admin/domain/Room.java
View File

@ -324,4 +324,7 @@ public class Room extends BaseEntity<Room> {
@TableField(exist = false) @TableField(exist = false)
private List<Long> ids; private List<Long> ids;
@TableField(exist = false)
private String customerId;
} }

3
ics-admin/src/main/java/com/ics/admin/domain/meeting/RoomRecord.java
View File

@ -36,4 +36,7 @@ public class RoomRecord extends BaseEntity<RoomRecord> {
private String type; private String type;
@TableField(exist = false)
private String equipmentType;
} }

5
ics-admin/src/main/java/com/ics/admin/service/impl/UserEquipmentServiceImpl.java
View File

@ -155,9 +155,10 @@ public class UserEquipmentServiceImpl extends ServiceImpl<UserEquipmentMapper, U
if (CollUtil.isEmpty(list)) { if (CollUtil.isEmpty(list)) {
return list; return list;
} }
List<Equipment> equipment = equipmentService.selectEquipmentList(new Equipment()); // List<Equipment> equipment = equipmentService.selectEquipmentList(new Equipment());
updateDeviceDataSource(equipment); //todo 查看对应的设备的状态
// updateDeviceDataSource(equipment);
ArrayList<Equipment> equipments = new ArrayList<>(); ArrayList<Equipment> equipments = new ArrayList<>();

1
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ShowroomServiceImpl.java
View File

@ -46,7 +46,6 @@ public class ShowroomServiceImpl extends ServiceImpl<ShowroomMapper, Showroom> i
queryWrapper.eq(showroom.getMeetingName() !=null,"meeting_name", showroom.getMeetingName()); queryWrapper.eq(showroom.getMeetingName() !=null,"meeting_name", showroom.getMeetingName());
queryWrapper.eq(showroom.getTenantId() !=null,"tenant_id", showroom.getTenantId()); queryWrapper.eq(showroom.getTenantId() !=null,"tenant_id", showroom.getTenantId());
queryWrapper.eq(showroom.getRoomId() !=null,"room_id", showroom.getRoomId()); queryWrapper.eq(showroom.getRoomId() !=null,"room_id", showroom.getRoomId());
queryWrapper.eq("is_show",0);
queryWrapper.in(showroom.getRoomIds() !=null,"room_id", showroom.getRoomIds()); queryWrapper.in(showroom.getRoomIds() !=null,"room_id", showroom.getRoomIds());
return showroomMapper.selectList(queryWrapper); return showroomMapper.selectList(queryWrapper);

31
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiEquipmentController.java
View File

@ -167,18 +167,31 @@ public class ApiEquipmentController extends BaseController {
@GetMapping("/scanOpenDoor") @GetMapping("/scanOpenDoor")
public R scanOpenDoor( RoomRecord roomRecord){ 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.getUserId());
log.info("房间id为{}",roomRecord.getRoomId()); log.info("房间id为{}",roomRecord.getRoomId());
// String ip = equipmentService.selectEquipmentById(roomRecord.getDeviceId()).getIp();
// log.info("ip地址为{}",ip); if (roomRecord.getEquipmentType().equals("displayScreen")){
// log.info("用户id为{}",roomRecord.getUserId()); Long deviceId = roomRecord.getDeviceId();
// log.info("房间id为{}",roomRecord.getRoomId()); 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); // String openlock = DeviceUtils.openlock(ip);
// JSONObject jsonObject = JSONUtil.parseObj(openlock); // JSONObject jsonObject = JSONUtil.parseObj(openlock);