From eb70b82c29aa08cd3e94b1f6c0ced5f1cd7135dd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 20 Mar 2023 11:41:13 +0800
Subject: [PATCH] sockeio连接调整,连接与获取菜单数据进行分离
---
src/main/java/org/springblade/modules/modules/controller/FunctionController.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
index 5a1223c..8953775 100644
--- a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
+++ b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
@@ -24,6 +24,8 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;
+import lombok.SneakyThrows;
+import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -32,9 +34,11 @@
import org.springblade.modules.modules.entity.FunctionEntity;
import org.springblade.modules.modules.service.IFunctionService;
import org.springblade.modules.modules.vo.FunctionVO;
+import org.springblade.modules.resource.builder.oss.OssBuilder;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.boot.ctrl.BladeController;
+import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -51,6 +55,10 @@
public class FunctionController extends BladeController {
private final IFunctionService modulesFunctionService;
+ /**
+ * 对象存储构建类
+ */
+ private final OssBuilder ossBuilder;
/**
* 功能表 详情
@@ -90,8 +98,8 @@
@GetMapping("/all")
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入modulesFunction")
- public R getAll(FunctionEntity function) {
- List<FunctionEntity> functionEntities = modulesFunctionService.getAll(function);
+ public R getAll(FunctionVO function) {
+ List<FunctionVO> functionEntities = modulesFunctionService.getAll(function);
return R.data(functionEntities);
}
@@ -135,5 +143,23 @@
return R.status(modulesFunctionService.deleteLogic(Func.toLongList(ids)));
}
+ /**
+ * 上传文件并保存至附件表
+ *
+ * @param file 文件
+ * @return ObjectStat
+ */
+ @SneakyThrows
+ @PostMapping("/put-file-attach")
+ public R putFileAttach(@RequestParam MultipartFile file) {
+ String fileName = file.getOriginalFilename();
+ BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
+
+
+
+
+ return R.success("添加成功");
+ }
+
}
--
Gitblit v1.9.3