From cb1794d34ab60176dd6e62c451a47774c5d9552f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 13:43:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/BookingsController.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 b1243f2..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
@@ -6,10 +6,10 @@
import com.doumee.api.BaseController;
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.PageData;
-import com.doumee.core.model.PageWrap;
+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;
@@ -17,13 +17,11 @@
import com.doumee.dao.system.dto.UserStatisticsDTO;
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;
@@ -66,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);
}
@@ -79,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);
}
@@ -87,8 +85,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings) {
- LoginUserInfo user = getLoginUser(null);
- bookings.setCreator(user.getId());
+ bookings.setLoginUserInfo(getLoginUser(null));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
@@ -107,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("鍙栨秷")
--
Gitblit v1.9.3