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/ImageResourcesController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
index a577643..e7c88b4 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/resources/ImageResourcesController.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.ImageResources;
import com.ycl.service.resources.IImageResourcesService;
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;
@@ -29,10 +31,11 @@
@Autowired
IImageResourcesService iImageResourcesService;
+
@GetMapping("/query")
@ApiOperation("鏌ヨ")
@LogSave(operationType = "鍥剧墖璧勬簮绠＄悊", contain = "鏌ヨ鍥剧墖")
- public CommonResult search(@RequestParam(required = false) Integer type,
+ public CommonResult search(@RequestParam(required = false) String type,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam Long size,
@@ -42,30 +45,31 @@
@PutMapping("modification")
@ApiOperation("淇敼鍥剧墖")
- @LogSave(operationType = "鍥剧墖绠＄悊",contain = "淇敼鍥剧墖")
+ @LogSave(operationType = "鍥剧墖绠＄悊", contain = "淇敼鍥剧墖")
public CommonResult modify(@RequestBody ImageResources imageResources) {
return CommonResult.success(iImageResourcesService.updateById(imageResources));
}
@DeleteMapping("deletion")
@ApiOperation("鍒犻櫎")
- @LogSave(operationType = "鍥剧墖绠＄悊",contain = "鍒犻櫎鍥剧墖")
+ @LogSave(operationType = "鍥剧墖绠＄悊", contain = "鍒犻櫎鍥剧墖")
public CommonResult delete(@RequestParam Integer id) {
return CommonResult.success(iImageResourcesService.removeById(id));
}
@PostMapping("addition")
@ApiOperation("娣诲姞")
- @LogSave(operationType = "鍥剧墖绠＄悊",contain = "娣诲姞鍥剧墖")
+ @LogSave(operationType = "鍥剧墖绠＄悊", contain = "娣诲姞鍥剧墖")
public CommonResult add(@RequestBody ImageResources imageResources) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ imageResources.setCreateUser(user.getUserId());
return CommonResult.success(iImageResourcesService.save(imageResources));
}
@DeleteMapping("deletion_batch")
@ApiOperation("鎵归噺鍒犻櫎")
- @LogSave(operationType = "鍥剧墖绠＄悊",contain = "鎵归噺鍒犻櫎鍥剧墖")
+ @LogSave(operationType = "鍥剧墖绠＄悊", contain = "鎵归噺鍒犻櫎鍥剧墖")
public CommonResult delete(@RequestParam List<Integer> ids) {
return CommonResult.success(iImageResourcesService.removeBatchByIds(ids));
}
-
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0