From d76ad5e7ac9d8d0788fd959081c1d19e7875938d Mon Sep 17 00:00:00 2001 From: lujiang Date: Wed, 25 Sep 2024 10:26:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MeetingReservationController.java | 2 +- .../controller/MeetingRoomController.java | 23 +++++++++++-------- .../controller/MeetingUtoController.java | 5 ++-- .../com/ics/admin/utils/MeetingRoomDTO.java | 23 +++++++++++++++++++ .../java/com/ics/admin/vo/MeetingRoomVo.java | 3 +++ .../mapper/admin/MeetingReservationMapper.xml | 7 +++--- 6 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/MeetingRoomDTO.java diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index d9c9791..9173b1b 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -93,7 +93,7 @@ public class MeetingReservationController extends BaseController { * * floor 所属楼层名称，精确查询 * * name 会议室名称，模糊查询 * * typeName 会议室形式，精确查询 - * * device 会议室设备，模糊查询 + * * devices 多个会议室设备，模糊查询,逻辑与关系 * * capacityNum 容纳人数，精确查询 */ @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingRoomController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingRoomController.java index 6e25c0b..3d2df57 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingRoomController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingRoomController.java @@ -4,6 +4,7 @@ import com.ics.admin.domain.MeetingRoom; import com.ics.admin.domain.RepairAttach; import com.ics.admin.service.IMeetingRoomService; import com.ics.admin.service.IRepairAttachService; +import com.ics.admin.utils.MeetingRoomDTO; import com.ics.admin.vo.MeetingRoomVo; import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; @@ -108,26 +110,29 @@ public class MeetingRoomController extends BaseController { /** * 新增会议室 - * @param files 附件id + * files 附件id */ @RequiresPermissions("admin:room:add") @PostMapping("save") - public R addSave(MeetingRoom meetingRoom, String[] files) { + public R addSave(@RequestBody MeetingRoomDTO meetingRoomDTO) { Long userId = getLoginStaffId(); - meetingRoom.setDeleteFlag(0); - meetingRoom.setCreateBy(userId.toString()); - meetingRoom.setCreateTime(new Date()); - return toAjax(meetingRoomService.insertMeetingRoom(meetingRoom,files)); + meetingRoomDTO.getRoom().setDeleteFlag(0); + meetingRoomDTO.getRoom().setCreateBy(userId.toString()); + meetingRoomDTO.getRoom().setCreateTime(new Date()); + return toAjax(meetingRoomService.insertMeetingRoom(meetingRoomDTO.getRoom(), meetingRoomDTO.getFiles())); } /** * 修改会议室 - * @param files 附件id + * files 附件id */ @RequiresPermissions("admin:room:edit") @PostMapping("update") - public R editSave(MeetingRoom meetingRoom, String[] files) { - return toAjax(meetingRoomService.updateMeetingRoom(meetingRoom, files)); + public R editSave(@RequestBody MeetingRoomDTO meetingRoomDTO) { + Long userId = getLoginStaffId(); + meetingRoomDTO.getRoom().setUpdateBy(userId.toString()); + meetingRoomDTO.getRoom().setUpdateTime(new Date()); + return toAjax(meetingRoomService.updateMeetingRoom(meetingRoomDTO.getRoom(), meetingRoomDTO.getFiles())); } /** diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingUtoController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingUtoController.java index e373733..f62aa65 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingUtoController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingUtoController.java @@ -6,6 +6,7 @@ import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import org.wf.jwtp.annotation.RequiresPermissions; @@ -55,7 +56,7 @@ public class MeetingUtoController extends BaseController { */ @RequiresPermissions(value = {"mr:manage:operator"}) @PostMapping("save") - public R addSave(MeetingUto meetingUto) { + public R addSave(@RequestBody MeetingUto meetingUto) { Long userId = getLoginStaffId(); meetingUto.setDeleteFlag(0); meetingUto.setCreateBy(userId.toString()); @@ -75,7 +76,7 @@ public class MeetingUtoController extends BaseController { */ @RequiresPermissions(value = {"mr:manage:operator"}) @PostMapping("update") - public R editSave(MeetingUto meetingUto) { + public R editSave(@RequestBody MeetingUto meetingUto) { Long userId = getLoginStaffId(); meetingUto.setUpdateBy(userId.toString()); meetingUto.setUpdateTime(new Date()); diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/MeetingRoomDTO.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/MeetingRoomDTO.java new file mode 100644 index 0000000..610666c --- /dev/null +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/utils/MeetingRoomDTO.java @@ -0,0 +1,23 @@ +package com.ics.admin.utils; + +import com.ics.admin.domain.MeetingRoom; +import lombok.Data; + +import java.io.Serializable; + +/** + * created at 2024-9-25 9:21 + * + * @author lujiang + * @version 1.0.0 + * @since 1.0.0 + */ +@Data +public class MeetingRoomDTO implements Serializable { + + private static final long serialVersionUID = -202409220922L; + + private MeetingRoom room; + + private String[] files; +} diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java index 18a098c..f61e9bf 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MeetingRoomVo.java @@ -66,6 +66,9 @@ public class MeetingRoomVo implements Serializable { */ private String device; + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private String[] devices; + /** * 房间号 */ diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml index 43bf9e1..6a78f69 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingReservationMapper.xml @@ -53,7 +53,9 @@ AND room.floor = #{floor} AND room.name LIKE CONCAT('%', #{name}, '%') AND room.type_name = #{typeName} - AND room.device LIKE CONCAT('%', #{device}, '%') + + AND device LIKE CONCAT('%', #{dev}, '%') + AND room.capacity_num = #{capacityNum} order by room_num @@ -88,11 +90,10 @@ AND floor = #{floor} AND name LIKE CONCAT('%', #{name}, '%') AND type_name = #{typeName} - AND device LIKE CONCAT('%', #{device}, '%') + AND room.device LIKE CONCAT('%', #{device}, '%') AND capacity_num = #{capacityNum} AND status = #{status} AND start LIKE CONCAT(#{filterDate}, '%') - order by start desc,status