From f798ba4c724cae90f93807ae597746f1f13b9621 Mon Sep 17 00:00:00 2001 From: chenze <1824191732@qq.com> Date: Tue, 10 Sep 2024 13:43:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=B8=8A=E6=B5=B7?= =?UTF-8?q?=E5=AF=B9=E5=BA=94bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WisdomDeviceServiceImpl.java | 2 +- .../impl/meeting/ReservationServiceImpl.java | 14 +++++++++++-- .../impl/meeting/RoomContentServiceImpl.java | 1 + .../com/ics/common/utils/DeviceUtils.java | 2 +- .../ics/common/utils/device/SignUtils.java | 4 +++- .../utils/device/WisDomDeviceUtils.java | 8 +++++++ .../quartz/task/MeetingOpenStatusTask.java | 2 +- .../meeting/ApiEquipmentController.java | 21 +++++++++++++++++-- .../mobile/wisdom/WisdomApiController.java | 20 +++++++++++++----- 9 files changed, 61 insertions(+), 13 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java index a97e16e..5c7590b 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/WisdomDeviceServiceImpl.java @@ -41,7 +41,7 @@ public class WisdomDeviceServiceImpl extends ServiceImpl selectWisdomDeviceList(WisdomDevice wisdomDevice) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.eq(wisdomDevice.getWisdomRoomId() !=null,"wisdom_room_id",wisdomDevice.getWisdomRoomId()); queryWrapper.eq(wisdomDevice.getType() !=null,"type",wisdomDevice.getType()); return wisdomDeviceMapper.selectList(queryWrapper); 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 51ecc4e..1c12e58 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 @@ -23,8 +23,10 @@ import com.ics.admin.domain.meeting.vo.MeetingAmountVo; import com.ics.admin.mapper.meeting.RoomContentMapper; import com.ics.admin.mapper.meeting.TicketMapper; import com.ics.admin.service.IBuildingDetailService; +import com.ics.admin.service.IIcsCustomerStaffService; import com.ics.admin.service.IRoomService; import com.ics.admin.service.meeting.IRoomContentService; +import com.ics.common.core.domain.IcsCustomerStaff; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +57,8 @@ public class ReservationServiceImpl extends ServiceImpl selectReservationListByUserId(Reservation reservation, Integer pageNum, Integer pageSize) { + IcsCustomerStaff staff = customerStaffService.selectIcsCustomerStaffById(reservation.getUserId()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("user_id",reservation.getUserId()); + if (!staff.getDataType().equals("7")){ + queryWrapper.eq("user_id",reservation.getUserId()); + } + queryWrapper.eq("park_id",reservation.getParkId()); - queryWrapper.orderByDesc("create_time"); + queryWrapper.orderByDesc("start_time"); IPage pages = new Page<>(pageNum,pageSize); IPage userIPage = reservationMapper.selectPage(pages,queryWrapper); for (Reservation reservation1 : userIPage.getRecords()) { 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 cd751a0..2d12383 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 @@ -339,6 +339,7 @@ public class RoomContentServiceImpl extends ServiceImpl reservation = reservationMapper.selectList(wrapper); for (Reservation reservation1 : reservation) { reservation1.setStatusValue(reservation1.getStauts().getValue()); diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/DeviceUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/DeviceUtils.java index 17f9063..a928c5c 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/DeviceUtils.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/DeviceUtils.java @@ -335,7 +335,7 @@ public class DeviceUtils { public static String openControlLock(String ip) { String url = "http://192.168.30.36:808/api/Op/OpDoor?ipaddress="+ip; String msg = HttpUtil.get(url); - log.info("查询人员id:{}", msg); + log.info("开门控制器的结果为结果:{}", msg); return msg; } diff --git a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java index 07f7422..860f44c 100644 --- a/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java +++ b/ics-common/ics-common-core/src/main/java/com/ics/common/utils/device/SignUtils.java @@ -33,6 +33,8 @@ public class SignUtils { return getMD5(sign1 + "|" + appID + "|" + key); } + + public static void lock(String lockId){ String appID = "8888"; String key = "cootoo"; @@ -49,7 +51,7 @@ public class SignUtils { Map heads = new HashMap<>(); - String body = HttpRequest.post("http://222.67.49.6:8888/cootoo/openLock") + String body = HttpRequest.post("http://222.67.230.123: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 2b1cba1..26d80f6 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 @@ -2,6 +2,7 @@ package com.ics.common.utils.device; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpRequest; +import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -303,6 +304,13 @@ public class WisDomDeviceUtils { return false; } + public static String openControlLock(String ip) { + String url = "http://222.67.230.123:1234/api/Op/OpDoor?ipaddress="+ip; + String msg = HttpUtil.get(url); + log.info("开门控制器的结果为结果:{}", msg); + return msg; + } + diff --git a/ics-quartz/src/main/java/com/ics/quartz/task/MeetingOpenStatusTask.java b/ics-quartz/src/main/java/com/ics/quartz/task/MeetingOpenStatusTask.java index 43f4cf8..64d7a5a 100644 --- a/ics-quartz/src/main/java/com/ics/quartz/task/MeetingOpenStatusTask.java +++ b/ics-quartz/src/main/java/com/ics/quartz/task/MeetingOpenStatusTask.java @@ -32,7 +32,7 @@ public class MeetingOpenStatusTask { log.info("预约会议室信息111111111111："+reservation); Date date = new Date(); - Date next = DateUtil.offsetMinute(date, 15); + Date next = DateUtil.offsetMinute(date, 10); String format = DateUtil.format(next, "HH:mm"); Date startTime = reservation.getStartTime(); String format1 = DateUtil.format(startTime, "HH:mm"); 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 65b09df..6334d13 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 @@ -20,6 +20,7 @@ import com.ics.common.core.page.TableSupport; import com.ics.common.utils.DeviceUtils; import com.ics.common.utils.StringUtils; import com.ics.common.utils.device.SignUtils; +import com.ics.common.utils.device.WisDomDeviceUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; @@ -236,6 +237,7 @@ public class ApiEquipmentController extends BaseController { WisdomDevice wisdomDevice = new WisdomDevice(); + log.info("会议室的id为{}", roomRecord.getRoomId()); //大会议室 52 茶室 53 小会议室 54 if(roomRecord.getRoomId() == 237L ){ @@ -245,8 +247,15 @@ public class ApiEquipmentController extends BaseController { wisdomDevice.setEquipmentNum("240"); }else if (roomRecord.getRoomId() == 239L){ wisdomDevice.setEquipmentNum("239"); + }else if (roomRecord.getRoomId() == 242L){ + wisdomDevice.setEquipmentNum("192.168.1.201"); + wisdomDevice.setType("开门控制器"); + }else if (roomRecord.getRoomId() == 243L){ + wisdomDevice.setEquipmentNum("192.168.1.34"); + wisdomDevice.setType("开门控制器"); } + Integer count = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), null); if (count == 0) return R.error("该用户没有权限开锁"); Integer count1 = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(roomRecord.getUserId())), "0"); @@ -255,10 +264,18 @@ public class ApiEquipmentController extends BaseController { for (WisdomStaff wisdomStaff : list) { boolean in = DateUtil.isIn(new Date(), wisdomStaff.getStartTime(), wisdomStaff.getEndDate()); if (!in) return R.error("该用户没有权限开锁"); - SignUtils.lock(wisdomDevice.getEquipmentNum()); + if (wisdomDevice.getType() !=null && wisdomDevice.getType().equals("开门控制器")){ + WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); + }else { + SignUtils.lock(wisdomDevice.getEquipmentNum()); + } } } else { - SignUtils.lock(wisdomDevice.getEquipmentNum()); + if (wisdomDevice.getType() !=null && wisdomDevice.getType().equals("开门控制器")){ + WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); + }else { + SignUtils.lock(wisdomDevice.getEquipmentNum()); + } } return R.ok("开门成功"); } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java b/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java index bc10285..ed92d16 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/wisdom/WisdomApiController.java @@ -101,7 +101,11 @@ public class WisdomApiController extends BaseController { if (count <= 0) return R.error("您没有权限查看该房间设备"); WisdomDevice wisdomDevice = new WisdomDevice(); wisdomDevice.setWisdomRoomId(id); - wisdomDevice.setType("门锁"); + if (id == 3 || id == 4) { + wisdomDevice.setType("门锁"); + }else if (id ==18 || id == 19){ + wisdomDevice.setType("开门控制器"); + } List wisdomDevices = wisdomDeviceService.selectWisdomDeviceList(wisdomDevice); return R.data(wisdomDevices); } @@ -116,7 +120,7 @@ public class WisdomApiController extends BaseController { public R getAllPanelInfoByRoomId(Long id) { long currentUserId = getLoginStaffId(); Integer integer = wisdomStaffService.selectByUserIdAndRoomId(Integer.parseInt(String.valueOf(currentUserId)), "0"); - if (integer <= 0) return R.data(new ArrayList<>()); + if (integer <= 0) return R.data(new ArrayList<>()); WisdomPanel wisdomPanel = new WisdomPanel(); wisdomPanel.setWisdomRoom(id); List wisdomPanels = wisdomPanelService.selectWisdomPanelList(wisdomPanel); @@ -129,7 +133,9 @@ public class WisdomApiController extends BaseController { WisdomDevice wisdomDevice = wisdomDeviceService.selectWisdomDeviceById(id); if (wisdomDevice == null) return R.error("设备不存在"); - + if (wisdomDevice.getType().equals("开门控制器")) { + return R.ok(); + } JSONObject deviceStatus = WisDomDeviceUtils.getDeviceStatus(wisdomDevice.getEquipmentNum(), wisdomDevice.getTypeName()); return R.ok(deviceStatus); @@ -176,12 +182,17 @@ public class WisdomApiController extends BaseController { boolean in = DateUtil.isIn(new Date(), offset, offset1); if (!in) return R.error("该用户没有权限开锁"); - SignUtils.lock(wisdomDevice.getEquipmentNum()); + + SignUtils.lock(wisdomDevice.getEquipmentNum()); } } else { +// WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); + SignUtils.lock(wisdomDevice.getEquipmentNum()); } } + if (wisdomDevice.getType().equals("开门控制器")) + WisDomDeviceUtils.openControlLock(wisdomDevice.getEquipmentNum()); return R.ok(); } @@ -219,7 +230,6 @@ public class WisdomApiController extends BaseController { List reservations = iReservationService.selectReservationListByDay(); for (Reservation reservation : reservations) { - log.info("预约会议室信息111111111111：" + reservation); Date date = new Date(); Date next = DateUtil.offsetMinute(date, 15);