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

接口请求方式调整

Browse Source
This commit is contained in:
lujiang 2024-09-24 22:01:00 +08:00
parent 8b8f9a33c6
commit 19c43417c0
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java
View File

@ -89,6 +89,12 @@ public class MeetingReservationController extends BaseController {
* mrdate：预约日期，格式：2024-09-23 * mrdate：预约日期，格式：2024-09-23
* timeFormat：预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。 * timeFormat：预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。
* 值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。 * 值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。
*
* * floor 所属楼层名称，精确查询
* * name 会议室名称，模糊查询
* * typeName 会议室形式，精确查询
* * device 会议室设备，模糊查询
* * capacityNum 容纳人数，精确查询
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("getAllRoom") @PostMapping("getAllRoom")
@ -124,7 +130,7 @@ public class MeetingReservationController extends BaseController {
* 无参，返回所有部门id及名称，已去重。 * 无参，返回所有部门id及名称，已去重。
* */ * */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("getOrg") @RequestMapping("getOrg")
public R getOrg() { public R getOrg() {
return R.ok().put("data", meetingUtoService.getOrg()); return R.ok().put("data", meetingUtoService.getOrg());
} }
@ -139,7 +145,7 @@ public class MeetingReservationController extends BaseController {
* personNum 会议室容纳人数，已去重。 * personNum 会议室容纳人数，已去重。
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("getConstData") @RequestMapping("getConstData")
public R getConstData() { public R getConstData() {
JSONObject jsonObject = meetingReservationService.getConstData(); JSONObject jsonObject = meetingReservationService.getConstData();
return R.ok().put("data", jsonObject); return R.ok().put("data", jsonObject);
@ -176,10 +182,10 @@ public class MeetingReservationController extends BaseController {
/* 预定时间的转换 */ /* 预定时间的转换 */
private Date convert(String date, Integer timeFormat, boolean start) { private Date convert(String date, Integer timeFormat, boolean start) {
String time = ""; String time = "";
if (timeFormat == 1) time = start ? " 08:30:00" : " 12:00:00";//1 上午 if (timeFormat == 1) time = start ? " 08:00:00" : " 12:00:00";//1 上午
if (timeFormat == 2) time = start ? " 12:00:01" : " 17:30:00";//2 下午 if (timeFormat == 2) time = start ? " 12:00:01" : " 18:00:00";//2 下午
if (timeFormat == 3) time = start ? " 17:30:01" : " 23:59:59";//3 晚上 if (timeFormat == 3) time = start ? " 18:00:01" : " 23:59:59";//3 晚上
if (timeFormat == 4) time = start ? " 08:30:00" : " 23:59:59";//4 全天 if (timeFormat == 4) time = start ? " 08:00:00" : " 23:59:59";//4 全天
try { try {
return DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, date + time); return DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, date + time);
} catch (Exception e) { } catch (Exception e) {
@ -285,7 +291,7 @@ public class MeetingReservationController extends BaseController {
* serveWaiter：会务服务组 * serveWaiter：会务服务组
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@PostMapping("getWaiter") @RequestMapping("getWaiter")
public R getWaiter() { public R getWaiter() {
IcsCustomerStaff p = new IcsCustomerStaff(); IcsCustomerStaff p = new IcsCustomerStaff();
p.setRoomRole(3); p.setRoomRole(3);
@ -333,7 +339,7 @@ public class MeetingReservationController extends BaseController {
* 参数：id，预约记录id。物理删除（包括所有关联数据），不可恢复 * 参数：id，预约记录id。物理删除（包括所有关联数据），不可恢复
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@RequestMapping("delete") @PostMapping("delete")
public R delete(@RequestBody Map<String, Long> param) { public R delete(@RequestBody Map<String, Long> param) {
Long id = param.get("id"); Long id = param.get("id");
return toAjax(meetingReservationService.deleteMeetingReservationById(id)); return toAjax(meetingReservationService.deleteMeetingReservationById(id));
@ -350,7 +356,7 @@ public class MeetingReservationController extends BaseController {
* waiters，分配的会务人员 * waiters，分配的会务人员
*/ */
@RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR)
@RequestMapping("getInfo") @PostMapping("getInfo")
public R get(@RequestBody Map<String, Long> param) { public R get(@RequestBody Map<String, Long> param) {
Long id = param.get("id"); Long id = param.get("id");
MeetingReservation meetingReservation = meetingReservationService.selectMeetingReservationById(id); MeetingReservation meetingReservation = meetingReservationService.selectMeetingReservationById(id);