From e5bf0d08d05f5c58224fe28cdf743a1bae88e3f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 30 十一月 2023 16:48:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
index 8ef0a6f..4f7feae 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/VideoResourcesController.java
@@ -3,12 +3,14 @@
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.entity.resources.VideoResources;
import com.ycl.service.resources.IVideoResourcesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -31,7 +33,8 @@
@GetMapping("/query")
@ApiOperation("鏌ヨ")
- public CommonResult search(@RequestParam(required = false) Integer type,
+ @LogSave(operationType = "瑙嗛璧勬簮绠＄悊", contain = "淇敼鍥剧墖")
+ public CommonResult search(@RequestParam(required = false) String type,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam Long size,
@@ -57,6 +60,8 @@
@ApiOperation("娣诲姞")
@LogSave(operationType = "瑙嗛绠＄悊", contain = "娣诲姞瑙嗛")
public CommonResult add(@RequestBody VideoResources videoResources) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ videoResources.setCreateUser(user.getUserId());
return CommonResult.success(iVideoResourcesService.save(videoResources));
}
@@ -66,4 +71,4 @@
public CommonResult delete(@RequestParam List<Integer> ids) {
return CommonResult.success(iVideoResourcesService.removeBatchByIds(ids));
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0