diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java index 031af22..08b36ec 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomStaffServiceImpl.java @@ -113,8 +113,7 @@ public class WisdomStaffServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq("wisdom_room_id",id); List wisdomStaffs = wisdomStaffMapper.selectList(wrapper); - List collect = wisdomStaffs.stream().map(WisdomStaff::getId).collect(Collectors.toList()); - return collect; + return wisdomStaffs.stream().map(WisdomStaff::getId).collect(Collectors.toList()); } @Override diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java index 1c12e58..e6078c3 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/ReservationServiceImpl.java @@ -238,6 +238,7 @@ public class ReservationServiceImpl extends ServiceImpl selectReservationListByUserId(Reservation reservation, Integer pageNum, Integer pageSize) { diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java index 2d12383..9caf4ef 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/meeting/RoomContentServiceImpl.java @@ -178,7 +178,6 @@ public class RoomContentServiceImpl extends ServiceImpl collect1 = roomContents1.stream().map(RoomContent::getId).collect(Collectors.toList()); - List studentList = roomContents.stream().map(item -> { return collect1.stream().filter(id -> { //条件判断 return item.getId() == id; @@ -187,11 +186,6 @@ public class RoomContentServiceImpl extends ServiceImpl 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) .body(on.toString()).timeout(30 * 1000).execute().body(); System.out.println(body); diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java index 26d80f6..faa8271 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/WisDomDeviceUtils.java @@ -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) { - 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); log.info("开门控制器的结果为结果:{}", msg); return msg; } + public static void main(String[] args) { + openControlLock("192.168.1.34"); + }