From 2c43f24c1a778b48ac20b07e17f5da38136cafb4 Mon Sep 17 00:00:00 2001
From: kimi42345 <kimi42345@outlook.com>
Date: 星期三, 11 三月 2020 13:28:10 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index 709c502..d11a05f 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -3,10 +3,14 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
+import com.highdatas.mdm.entity.DeletedTableLog;
+import com.highdatas.mdm.entity.MenuMapping;
import com.highdatas.mdm.entity.SysMenu;
import com.highdatas.mdm.pojo.CodeMsg;
import com.highdatas.mdm.pojo.MaintainDataType;
import com.highdatas.mdm.pojo.Result;
+import com.highdatas.mdm.service.IDeletedTableLogService;
+import com.highdatas.mdm.service.IMenuMappingService;
import com.highdatas.mdm.service.ISysMenuService;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
@@ -15,9 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
/**
* <p>
@@ -31,7 +33,14 @@
@RequestMapping("/menu")
public class SysMenuController {
@Autowired
- private ISysMenuService menuService;
+ ISysMenuService menuService;
+
+ @Autowired
+ IMenuMappingService menuMappingService;
+
+ @Autowired
+ IDeletedTableLogService deletedTableLogService;
+
@RequestMapping(value = "/all", method = RequestMethod.GET)
public Result<List<SysMenu>> getAll() {
@@ -39,6 +48,25 @@
sysMenuEntityWrapper.orderBy(" parent_id, order_no");
return Result.success(menuService.selectList(sysMenuEntityWrapper)) ;
}
+
+ @RequestMapping(value = "/list", method = RequestMethod.GET)
+ public Result<List<SysMenu>> getMenuList() {
+ EntityWrapper<SysMenu> sysMenuEntityWrapper = new EntityWrapper<>();
+ sysMenuEntityWrapper.eq("data_type","currentData");
+ sysMenuEntityWrapper.orderBy(" parent_id, order_no");
+ List<SysMenu> sysMenus = menuService.selectList(sysMenuEntityWrapper);
+ LinkedHashSet<String> parentIdSet = new LinkedHashSet<>();
+ for (SysMenu sysMenu : sysMenus) {
+ String parentId = sysMenu.getParentId();
+ parentIdSet.add(parentId);
+ }
+ Set<String> byParentId = menuService.getByParentId(parentIdSet);
+ List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
+
+ return Result.success(parentList) ;
+ }
+
+
@RequestMapping(value = "/allTheme", method = RequestMethod.GET)
public Result<List<SysMenu>> getAllTheme() {
@@ -52,7 +80,7 @@
public Result<Page<SysMenu>> getAll(@PathVariable int pageno, HttpServletRequest request) {
String pageSize = request.getParameter("pageSize");
if (StringUtils.isEmpty(pageSize)) {
- pageSize = "20";
+ pageSize = "15";
}
Integer size = Integer.valueOf(pageSize);
Page page = new Page(pageno, size);
@@ -213,6 +241,14 @@
HashSet<SysMenu> sysMenus = deleteMenuByParentId(data, menuid);
for (SysMenu sysMenu : sysMenus) {
+ List<MenuMapping> menuMappingList = menuMappingService.selectList(new EntityWrapper<MenuMapping>().eq("menu_id", sysMenu.getId()));
+ for (MenuMapping menuMapping : menuMappingList) {
+ // 娣诲姞寰呭垹闄よ〃鐨勬棩蹇�
+ DeletedTableLog deletedTableLog = new DeletedTableLog();
+ deletedTableLog.setId(DbUtils.getUUID()).setTableName(menuMapping.getTableName()).setCreateTime(new Date());
+ deletedTableLog.insert();
+ menuMapping.deleteById();
+ }
sysMenu.deleteById();
}
boolean delete = menuService.deleteById(menuid);
--
Gitblit v1.8.0