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/MenuMappingController.java | 68 +++++++++++++++++++++++++++++---- 1 files changed, 59 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java b/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java index d563cc0..ee155c9 100644 --- a/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java +++ b/src/main/java/com/highdatas/mdm/controller/MenuMappingController.java @@ -1,17 +1,25 @@ package com.highdatas.mdm.controller; +import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.highdatas.mdm.entity.MenuMapping; +import com.highdatas.mdm.entity.SysMenu; +import com.highdatas.mdm.entity.TUser; import com.highdatas.mdm.pojo.CodeMsg; import com.highdatas.mdm.pojo.Result; import com.highdatas.mdm.service.IMaintainDetailService; import com.highdatas.mdm.service.IMaintainService; import com.highdatas.mdm.service.IMenuMappingService; +import com.highdatas.mdm.service.ISysMenuService; +import com.highdatas.mdm.util.DbUtils; +import com.highdatas.mdm.util.NoticeClient; 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.Date; +import java.util.LinkedHashSet; +import java.util.List; /** * <p> @@ -33,17 +41,27 @@ @Autowired IMaintainDetailService maintainDetailService; + @Autowired + ISysMenuService menuService; + @Autowired + NoticeClient noticeClient; @RequestMapping(value = "/get/{id}", method = RequestMethod.GET) public Result<MenuMapping> get(@PathVariable String id, HttpServletRequest request) { return menuMappingService.getMapping(request.getSession(),id); } + + @RequestMapping(value = "/add", method = RequestMethod.POST) - public Result<Object> insert(@RequestParam String data, HttpServletRequest request) { - HttpSession session = request.getSession(); - boolean inserted =menuMappingService.create(data, session); - if (inserted) { - return Result.success("鎻掑叆鎴愬姛", null); + public Result<Object> insert(@RequestBody MenuMapping menuMapping, HttpServletRequest request) { + String menuId = menuMapping.getMenuId(); + int cnt = menuMappingService.selectCount(new EntityWrapper<MenuMapping>().eq("menu_id", menuId)); + if (cnt != 0) { + menuMapping.updateById(); + } + MenuMapping inserted = menuMappingService.create(menuMapping); + if (inserted != null) { + return Result.success(inserted); } else { return Result.error(CodeMsg.INSERT_ERROR); } @@ -51,10 +69,40 @@ } @RequestMapping(value = "/update", method = RequestMethod.POST) - public Result<Object> update(@RequestParam String data) throws Exception { - boolean updated =menuMappingService.update(data); + public Result<Object> update(@RequestBody MenuMapping menuMapping, HttpServletRequest request) { + menuMapping.setUpdateTime(new Date()); + String menuId = menuMapping.getMenuId(); + SysMenu menu = menuService.selectById(menuId); + String preParentId = menu.getParentId(); + + String themeId = menuMapping.getThemeId(); + if (!preParentId.equalsIgnoreCase(themeId)) { + menu.setParentId(themeId); + menu.updateById(); + } + boolean updated = menuMapping.updateById(); if (updated) { - return Result.success("鏇存柊鎴愬姛", null); + + + + TUser user = DbUtils.getUser(request); + if (menu != null) { + LinkedHashSet<String> parentIdSet = new LinkedHashSet<>(); + parentIdSet.add(menuId); + LinkedHashSet<String> byParentId = menuService.getByParentId(parentIdSet); + if (byParentId == null) { + noticeClient.EditMenuMapping(menu, null, user.getUserId()); + } else { + if (!byParentId.isEmpty()) { + List<SysMenu> sysMenus = menuService.selectBatchIds(byParentId); + SysMenu parentMenu = sysMenus.get(0); + noticeClient.EditMenuMapping(menu, parentMenu, user.getUserId()); + } + + } + } + + return Result.success(menuMapping); } else { return Result.error(CodeMsg.UPDATE_ERROR); } @@ -70,4 +118,6 @@ } } + + } -- Gitblit v1.8.0