From 5ea57ed52d8cb6a0990c12be67d00e7949dec9fb Mon Sep 17 00:00:00 2001 From: chendaze <1824191732@qq.com> Date: Mon, 18 Mar 2024 08:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=9A=84=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BA=86=E8=AE=BE=E5=A4=87=E5=BC=80=E9=97=A8=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ics/admin/domain/meeting/Reservation.java | 3 +++ .../ics/admin/service/impl/RoomEquipmentServiceImpl.java | 8 ++++++++ .../service/impl/meeting/RoomContentServiceImpl.java | 6 ++++++ .../ics/admin/service/meeting/IRoomEquipmentService.java | 2 ++ .../java/com/ics/controller/mobile/SmallWxOkHttp.java | 4 ++-- .../controller/mobile/meeting/ApiEquipmentController.java | 2 +- .../ics/controller/mobile/meeting/ApiRoomController.java | 8 +++++++- 7 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java index ff6f9c5..b970d0c 100644 --- a/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java +++ b/ics-admin/src/main/java/com/ics/admin/domain/meeting/Reservation.java @@ -154,4 +154,7 @@ public class Reservation extends BaseEntity { @TableField(exist = false) private RoomContent roomContent; + @TableField(exist = false) + private Long equipmentId; + } diff --git a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java index db21616..2aa2d23 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java +++ b/ics-admin/src/main/java/com/ics/admin/service/impl/RoomEquipmentServiceImpl.java @@ -98,4 +98,12 @@ public class RoomEquipmentServiceImpl extends ServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq("room_id",roomId); + return roomEquipmentMapper.selectOne(wrapper); + } } 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 c6344e5..6ae7199 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 @@ -49,6 +49,9 @@ public class RoomContentServiceImpl extends ServiceImpl todayMeeting(RoomContent roomContent) { + //查询当前之前以后，当前时间是否包含在会议室 List reservations = reservationMapper.todayMeeting(roomContent.getId()); for (Reservation reservation : reservations) { Long userId = reservation.getUserId(); IcsCustomerStaff customerStaff = staffService.selectIcsCustomerStaffById(userId); reservation.setUserName(customerStaff.getUsername()); + + } return reservations; } diff --git a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java index 09966d5..aba17e9 100644 --- a/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java +++ b/ics-admin/src/main/java/com/ics/admin/service/meeting/IRoomEquipmentService.java @@ -60,4 +60,6 @@ public interface IRoomEquipmentService extends IService { int deleteRoomEquipmentById(Long id); RoomEquipment selectByEquipmentId(Long id); + + RoomEquipment selectRoomId(Long roomId); } diff --git a/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java b/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java index e211f55..ecf7f64 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/SmallWxOkHttp.java @@ -10,8 +10,8 @@ import java.util.Map; public class SmallWxOkHttp { - static String APP_ID = "wxd9f93ef41a607dd5"; - static String SECRET = "417507767334672bc46bb6eb3bf1c29b"; + static String APP_ID = "wx5582a07c1fbbcf06"; + static String SECRET = "ad24130a8919c613efd9538f69abafd3"; public static JSONObject sendGet(String url , Map map){ OkHttpClient client = new OkHttpClient(); 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 2c5a2c2..6b2c3b3 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 @@ -107,7 +107,7 @@ public class ApiEquipmentController extends BaseController { * 扫描二维码开门 用户id 和设备id */ @RequiresPermissions("member:center:view") - @PostMapping("/scanOpenDoor") + @GetMapping("/scanOpenDoor") public R scanOpenDoor( RoomRecord roomRecord){ // long currentUserId = getCurrentUserId(); diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java index 0a6f494..c71939e 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomController.java @@ -68,7 +68,7 @@ public class ApiRoomController extends BaseController { private IParkService parkService; @Autowired - private RoomEquipmentMapper roomEquipmentMapper; + private IRoomEquipmentService roomEquipmentService; /** @@ -78,7 +78,13 @@ public class ApiRoomController extends BaseController { @PostMapping("list") public R list() { List roomContents = roomContentService.selectApiRoomList(new RoomContent()); + for (RoomContent roomContent : roomContents) { + RoomEquipment roomEquipment = roomEquipmentService.selectRoomId(roomContent.getRoomId()); + if (null != roomEquipment){ + roomContent.setEquipmentId(roomEquipment.getEquipmentId()); + } + } return R.data(roomContents); }