From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 48 ++++++++++++++++++++++--------------------------
1 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
index 603c659..ae1402f 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java
@@ -3,41 +3,40 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.dao.business.model.Bookings;
+import com.doumee.dao.business.vo.RoomStatisticsVo;
import com.doumee.dao.system.dto.UserStatisticsDTO;
-import com.doumee.dao.system.vo.RoomStatisticsVo;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.response.DateTimeResourceDate;
-import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.service.business.BookingsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
* @author 姹熻箘韫�
@@ -56,7 +55,7 @@
@PostMapping("/create")
@RequiresPermissions("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
bookings.setCreator(user.getId());
return ApiResponse.success(bookingsService.create(bookings));
}
@@ -65,7 +64,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:bookings:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
- bookingsService.deleteById(id);
+ bookingsService.deleteById(id,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -78,7 +77,7 @@
for (String id : idArray) {
idList.add(Integer.valueOf(id));
}
- bookingsService.deleteByIdInBatch(idList);
+ bookingsService.deleteByIdInBatch(idList,this.getLoginUser(null));
return ApiResponse.success(null);
}
@@ -86,8 +85,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- bookings.setCreator(user.getId());
+ bookings.setLoginUserInfo(getLoginUser(null));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
@@ -106,12 +104,12 @@
ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
}
- @ApiOperation("鏍规嵁ID鏌ヨ")
- @GetMapping("/{id}")
- @RequiresPermissions("business:bookings:query")
- public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
- return ApiResponse.success(bookingsService.getMeetingDetail(id));
- }
+// @ApiOperation("鏍规嵁ID鏌ヨ")
+// @GetMapping("/{id}")
+// @RequiresPermissions("business:bookings:query")
+// public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id) {
+// return ApiResponse.success(bookingsService.getMeetingDetail(id));
+// }
@ApiOperation("鍙栨秷")
@@ -196,7 +194,7 @@
startTime = DateUtil.getMonday();
endTime = DateUtil.getSunday();
}
- return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser().getId(), null,startTime,endTime));
+ return ApiResponse.success(bookingsService.getMyJoinBookingMeet(getLoginUser(null).getId(), null,startTime,endTime));
}
/**
@@ -206,8 +204,6 @@
@ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
@PostMapping("/findMothBookingMeet")
public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth){
-
-
- return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser().getId(),roomId,dateMonth));
+ return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(null).getId(),roomId,dateMonth));
}
}
--
Gitblit v1.9.3