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

修改了上海对应bug

Browse Source
This commit is contained in:
chenze 2024-09-25 15:14:25 +08:00
parent f798ba4c72
commit 6310953379
5 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java
View File

@ -113,8 +113,7 @@ public class WisdomStaffServiceImpl extends ServiceImpl<WisdomStaffMapper, Wisdo
QueryWrapper<WisdomStaff> wrapper = new QueryWrapper<>(); QueryWrapper<WisdomStaff> wrapper = new QueryWrapper<>();
wrapper.eq("wisdom_room_id",id); wrapper.eq("wisdom_room_id",id);
List<WisdomStaff> wisdomStaffs = wisdomStaffMapper.selectList(wrapper); List<WisdomStaff> wisdomStaffs = wisdomStaffMapper.selectList(wrapper);
List<Long> collect = wisdomStaffs.stream().map(WisdomStaff::getId).collect(Collectors.toList()); return wisdomStaffs.stream().map(WisdomStaff::getId).collect(Collectors.toList());
return collect;
} }
@Override @Override

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

@ -238,6 +238,7 @@ public class ReservationServiceImpl extends ServiceImpl<ReservationMapper, Reser
} }
} }
// 根据用户查询预约详情
@Override @Override
public IPage<Reservation> selectReservationListByUserId(Reservation reservation, Integer pageNum, Integer pageSize) { public IPage<Reservation> selectReservationListByUserId(Reservation reservation, Integer pageNum, Integer pageSize) {

6
ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java
View File

@ -178,7 +178,6 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
} }
List<Long> collect1 = roomContents1.stream().map(RoomContent::getId).collect(Collectors.toList()); List<Long> collect1 = roomContents1.stream().map(RoomContent::getId).collect(Collectors.toList());
List<RoomContent> studentList = roomContents.stream().map(item -> { List<RoomContent> studentList = roomContents.stream().map(item -> {
return collect1.stream().filter(id -> { //条件判断 return collect1.stream().filter(id -> { //条件判断
return item.getId() == id; return item.getId() == id;
@ -187,11 +186,6 @@ public class RoomContentServiceImpl extends ServiceImpl<RoomContentMapper, RoomC
}).collect(Collectors.toList()); }).collect(Collectors.toList());
}).flatMap(List::stream).collect(Collectors.toList());//设置返回结果类型 }).flatMap(List::stream).collect(Collectors.toList());//设置返回结果类型
System.out.println(studentList);
return selectRoomContentList(studentList); return selectRoomContentList(studentList);
}else { }else {
if (roomContent.getType() != null) { if (roomContent.getType() != null) {

4
ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java
View File

@ -51,7 +51,9 @@ public class SignUtils {
Map<String, String > heads = new HashMap<>(); Map<String, String > heads = new HashMap<>();
String body = HttpRequest.post("http://222.67.230.123:8888/cootoo/openLock") System.out.println("ip为："+"222.67.226.196");
String body = HttpRequest.post("http://222.67.226.196:8888/cootoo/openLock")
.headerMap(heads, false) .headerMap(heads, false)
.body(on.toString()).timeout(30 * 1000).execute().body(); .body(on.toString()).timeout(30 * 1000).execute().body();
System.out.println(body); System.out.println(body);

13
ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java
View File

@ -79,12 +79,7 @@ public class WisDomDeviceUtils {
} }
public static void main(String[] args) {
// JSONObject jsonObject = getDeviceStatus(210, "KONKE_ZIGBEE_CHOPIN_CURTAIN_CUSTOM");
// System.out.println(jsonObject);
openCover("4ab376ffdef1f8e0e7b346ead9ab648b","open_cover");
// openCover("edd8a7b5390b7fa6359d5b411f82a936","close_cover");
}
/** /**
* 设备通用操作 (开关等控制器) * 设备通用操作 (开关等控制器)
@ -305,12 +300,16 @@ public class WisDomDeviceUtils {
} }
public static String openControlLock(String ip) { public static String openControlLock(String ip) {
String url = "http://222.67.230.123:1234/api/Op/OpDoor?ipaddress="+ip; String url = "http://222.67.226.196:1234/api/Op/OpDoor?ipaddress="+ip;
log.info("开门控制器的url:{}", "222.67.226.196");
String msg = HttpUtil.get(url); String msg = HttpUtil.get(url);
log.info("开门控制器的结果为结果:{}", msg); log.info("开门控制器的结果为结果:{}", msg);
return msg; return msg;
} }
public static void main(String[] args) {
openControlLock("192.168.1.34");
}