From c8aee7b9bfd79cfd741d7e5692520f4f51a31a86 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期一, 18 五月 2020 18:30:01 +0800
Subject: [PATCH] bak 修改 获取版本数据前
---
src/main/java/com/highdatas/mdm/controller/SysMenuController.java | 46 ++++++++++++++++++++++++++++++----------------
1 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
index 95a9555..1d931d8 100644
--- a/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
+++ b/src/main/java/com/highdatas/mdm/controller/SysMenuController.java
@@ -11,13 +11,17 @@
import com.highdatas.mdm.service.*;
import com.highdatas.mdm.util.Constant;
import com.highdatas.mdm.util.DbUtils;
+import com.highdatas.mdm.util.NoticeClient;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.util.*;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.List;
import java.util.stream.Collectors;
/**
@@ -48,8 +52,9 @@
IMaintainFieldService maintainFieldService;
@Autowired
IMasterAuthorService masterAuthorService;
-
- @RequestMapping(value = "/all", method = RequestMethod.GET)
+ @Autowired
+ NoticeClient noticeClient;
+ @RequestMapping(value = "/all")
public Result<List<SysMenu>> getAll() {
EntityWrapper<SysMenu> sysMenuEntityWrapper = new EntityWrapper<>();
sysMenuEntityWrapper.orderBy("parent_id, order_no");
@@ -59,7 +64,7 @@
@RequestMapping(value = "/author/all", method = RequestMethod.GET)
public Result<List<SysMenu>> getAllBak(HttpServletRequest request) {
TUser user = DbUtils.getUser(request);
- List<SysMenu> menu = masterAuthorService.getMenu(user.getUserId());
+ List<SysMenu> menu = masterAuthorService.getMenu(user);
return Result.success(menu) ;
}
@@ -89,7 +94,7 @@
}
tableNameSet.add(tableName);
}
- maintainIds = maintainIds.stream().filter(s -> masterAuthorService.checkMaintainAuthor(userId,s)).collect(Collectors.toList());
+ maintainIds = maintainIds.stream().filter(s -> masterAuthorService.checkMaintainAuthor(user,s)).collect(Collectors.toList());
if (!maintainIds.isEmpty()) {
List<Maintain> maintains = maintainService.selectBatchIds(maintainIds);
@@ -105,12 +110,10 @@
return Result.success(null);
}
LinkedHashSet<String> parentIdSet = new LinkedHashSet<>(menuIds);
- Set<String> byParentId = menuService.getByParentId(parentIdSet);
-
- if (byParentId == null || byParentId.isEmpty()) {
+ List<SysMenu> parentList = menuService.getMenuByParentId(parentIdSet);
+ if (parentList == null) {
return Result.success(null);
}
- List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
return Result.success(parentList);
}
@@ -135,8 +138,7 @@
}
parentIdSet.add(sysMenu.getId());
}
- Set<String> byParentId = menuService.getByParentId(parentIdSet);
- List<SysMenu> parentList = menuService.selectBatchIds(byParentId);
+ List<SysMenu> parentList = menuService.getMenuByParentId(parentIdSet);
return Result.success(parentList) ;
}
@@ -201,7 +203,7 @@
menu.setId(uuid);
menu.setParentId(parentId);
menu.setOrderNo(orderno);
- menu.setMenuType(menuType);
+ menu.setMenuType(menuType).setCreateTime(new Date());
boolean inserted = menuService.insert(menu);
if (inserted) {
return Result.success(menu);
@@ -244,7 +246,7 @@
}else {
orderno = Integer.valueOf(ordernoStr);
}
- menu = new SysMenu().setId(id).setParentId(parentId).setMenuType(menuType).setName(name).setOrderNo(orderno);
+ menu = new SysMenu().setCreateTime(new Date()).setId(id).setParentId(parentId).setMenuType(menuType).setName(name).setOrderNo(orderno);
menu.insert();
}
@@ -263,9 +265,11 @@
@RequestMapping(value = "/update", method = RequestMethod.GET)
public Result<Object> update(@RequestParam String id, HttpServletRequest request) {
SysMenu menu = menuService.selectById(id);
+
if (menu == null) {
return Result.error(CodeMsg.SELECT_ERROR_NOTFOUND);
}
+ menu.setUpdateTime(new Date());
String ordernoStr = request.getParameter("orderNo");
String parentId = request.getParameter("parentId");
String menuType = request.getParameter("menuType");
@@ -306,23 +310,33 @@
return result;
}
@RequestMapping(value = "/delete/{menuid}", method = RequestMethod.GET)
- public Result<Object> delete(@PathVariable String menuid) throws Exception {
+ public Result<Object> delete(@PathVariable String menuid, HttpServletRequest request) throws Exception {
+ TUser user = DbUtils.getUser(request);
Result<List<SysMenu>> all = getAll();
List<SysMenu> data = all.getData();
+ SysMenu parentMenu = menuService.selectById(menuid);
+
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) {
- //todo 娣诲姞寰呭垹闄よ〃鐨勬棩蹇�
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);
+ if (parentMenu == null) {
+ return Result.success(null);
+ }
+ String menuType = parentMenu.getMenuType();
+
+ boolean delete = parentMenu.deleteById();
if (delete) {
return Result.success(null);
} else {
--
Gitblit v1.8.0