From 330001d0433b05e82779b4c5e945ad7ed4eaa50b Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 九月 2024 19:01:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
index f172db5..9931ccc 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mpk/controller/admin/MpkFileController.java
@@ -8,6 +8,7 @@
import org.apache.commons.io.IOUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -41,6 +42,10 @@
@GetMapping("{id}")
public CommonResult<MpkFileDTO> info(@PathVariable("id") String id) {
MpkFileDTO schedule = mpkFileService.get(id);
+ List<String> menuAndGroup = new ArrayList<>();
+ menuAndGroup.add(schedule.getMenuName());
+ menuAndGroup.add(schedule.getGroupName());
+ schedule.setMenuAndGroup(menuAndGroup);
return success(schedule);
}
@@ -55,6 +60,12 @@
@PreAuthorize("@ss.hasPermission('mpk:file:create')")
@PostMapping
public CommonResult<Boolean> save(@RequestBody MpkFileDTO dto) {
+ if (!CollectionUtils.isEmpty(dto.getMenuAndGroup())) {
+ dto.setMenuName(dto.getMenuAndGroup().get(0));
+ if (dto.getMenuAndGroup().size() > 1) {
+ dto.setGroupName(dto.getMenuAndGroup().get(1));
+ }
+ }
mpkFileService.save(dto);
return CommonResult.success(true);
}
@@ -69,6 +80,12 @@
@PreAuthorize("@ss.hasPermission('mpk:file:update')")
@PutMapping
public CommonResult<Boolean> update(@RequestBody MpkFileDTO dto) {
+ if (!CollectionUtils.isEmpty(dto.getMenuAndGroup())) {
+ dto.setMenuName(dto.getMenuAndGroup().get(0));
+ if (dto.getMenuAndGroup().size() > 1) {
+ dto.setGroupName(dto.getMenuAndGroup().get(1));
+ }
+ }
mpkFileService.update(dto);
return CommonResult.success(true);
}
--
Gitblit v1.9.3