From f8c33ad3fb09dd0f70b68b74d59ce28761142bf0 Mon Sep 17 00:00:00 2001
From: Van333 <van666666@foxmail.com>
Date: 星期一, 14 十一月 2022 15:21:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xm-20221107' into xm-20221107
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlatformFileController.java | 31 ++++++++++++++++++++++++++++---
1 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlatformFileController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlatformFileController.java
index e423d9b..03bee2c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlatformFileController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlatformFileController.java
@@ -42,7 +42,12 @@
*/
@PostMapping("/addProgramFile")
public ResponseVO<Object> addProgramFile(@RequestParam("file") MultipartFile file) {
- return ResponseUtil.success(platformFileService.addProgramFile(file));
+ boolean b = platformFileService.addProgramFile(file);
+ if(b){
+ return ResponseUtil.success("涓婁紶鎴愬姛");
+ }else {
+ return ResponseUtil.fail("涓婁紶澶辫触");
+ }
}
/**
@@ -53,7 +58,12 @@
*/
@PostMapping("/updateFileName")
public ResponseVO<Object> updateFileName(@RequestBody EditFileParam param) {
- return ResponseUtil.success(platformFileService.updateFileName(param));
+ boolean b = platformFileService.updateFileName(param);
+ if(b){
+ return ResponseUtil.success("缂栬緫鎴愬姛");
+ }else {
+ return ResponseUtil.fail("缂栬緫澶辫触");
+ }
}
/**
@@ -64,7 +74,12 @@
*/
@PostMapping("/deleteFile")
public ResponseVO<Object> deleteFile(@RequestBody EditFileParam param) {
- return ResponseUtil.success(platformFileService.deleteFile(param));
+ boolean b = platformFileService.deleteFile(param);
+ if(b){
+ return ResponseUtil.success("鍒犻櫎鎴愬姛");
+ }else {
+ return ResponseUtil.fail("鍒犻櫎澶辫触");
+ }
}
/**
@@ -88,4 +103,14 @@
return ResponseUtil.success(platformFileService.setPermission(platformFilePermissionParam));
}
+ @GetMapping("/allUserList")
+ public ResponseVO<Object> allUserList() {
+ return ResponseUtil.success(platformFileService.allUserList());
+ }
+
+ @GetMapping("/permissionInfo")
+ public ResponseVO<Object> permissionInfo(@RequestParam("fileId") Long fileId) {
+ return ResponseUtil.success(platformFileService.permissionInfo(fileId));
+ }
+
}
--
Gitblit v1.9.3