Просмотр исходного кода

[菜单][修改]:默认不显示移动端数据塔台

release_toaliyun_real
Stormeye Wu 7 лет назад
Родитель
Сommit
3004440691
4 измененных файлов: 26 добавлений и 27 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/MallPermissionService.java
  3. +19
    -20
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  4. +1
    -1
      mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -55,7 +55,7 @@ public class SysMenuController extends BaseController {
public ResultData nav(){ public ResultData nav(){
logger.debug("[" + getIpAddr() + "] MallPermissionController::nav"); logger.debug("[" + getIpAddr() + "] MallPermissionController::nav");
MallUserInfo user = getUser(); MallUserInfo user = getUser();
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L);
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L, true);
Set<String> permissions = mallUserInfoService.getUserPermissions(user); Set<String> permissions = mallUserInfoService.getUserPermissions(user);
Map map = new HashMap<>(); Map map = new HashMap<>();
map.put("menuList", menuList); map.put("menuList", menuList);
@@ -90,7 +90,7 @@ public class SysMenuController extends BaseController {
public ResultData getMenuIdsById(Long parentId) { public ResultData getMenuIdsById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById"); logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser(); MallUserInfo user = getUser();
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.queryUserMenuIds(user, parentId));
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.queryUserMenuIds(user, parentId, false));
} }


@ApiOperation("获取父子菜单信息") @ApiOperation("获取父子菜单信息")
@@ -100,7 +100,7 @@ public class SysMenuController extends BaseController {
public ResultData getMenusById(Long parentId) { public ResultData getMenusById(Long parentId) {
logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById"); logger.debug("[" + getIpAddr() + "] MallPermissionController::getMenusById");
MallUserInfo user = getUser(); MallUserInfo user = getUser();
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getUserMenuList(user, parentId));
return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getUserMenuList(user, parentId, false));
} }


} }

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/MallPermissionService.java Просмотреть файл

@@ -14,7 +14,7 @@ public interface MallPermissionService {
* @param menuIdList * @param menuIdList
* @return * @return
*/ */
List<MallPermission> queryListParentId(Long parentId, List<Long> menuIdList);
List<MallPermission> queryListParentId(Long parentId, List<Long> menuIdList, boolean boolNav);




/** /**
@@ -35,14 +35,14 @@ public interface MallPermissionService {
* @param userInfo * @param userInfo
* @return * @return
*/ */
List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId);
List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav);


/** /**
* 用户菜单ID List * 用户菜单ID List
* @param userInfo * @param userInfo
* @return * @return
*/ */
List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId);
List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav);


/** /**
* 根据实体查询分页列表 * 根据实体查询分页列表


+ 19
- 20
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Просмотреть файл

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallPermission;
import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.MallUserInfo;
import com.iformall.enums.EnumMenuType;
import com.iformall.enums.EnumPermissionType; import com.iformall.enums.EnumPermissionType;
import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumUserAdmin;
import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallPermissionMapper;
@@ -36,7 +37,7 @@ public class MallPermissionServiceImpl implements MallPermissionService {
private WxMallMapper wxMallMapper; private WxMallMapper wxMallMapper;


@Override @Override
public List<MallPermission> queryListParentId(Long parentId, List<Long> menuIdList) {
public List<MallPermission> queryListParentId(Long parentId, List<Long> menuIdList, boolean boolNav) {
List<MallPermission> menuList = queryListParentId(parentId); List<MallPermission> menuList = queryListParentId(parentId);
if(menuIdList == null){ if(menuIdList == null){
return menuList; return menuList;
@@ -44,6 +45,11 @@ public class MallPermissionServiceImpl implements MallPermissionService {


List<MallPermission> userMenuList = new ArrayList<>(); List<MallPermission> userMenuList = new ArrayList<>();
for(MallPermission menu : menuList){ for(MallPermission menu : menuList){
if(boolNav) {
if(menu.getId().longValue() == (long)EnumMenuType.MOBILE_ADMIN.getCode()) {
continue;
}
}
if(menuIdList.contains(menu.getId())){ if(menuIdList.contains(menu.getId())){
userMenuList.add(menu); userMenuList.add(menu);
} }
@@ -70,18 +76,18 @@ public class MallPermissionServiceImpl implements MallPermissionService {
} }


@Override @Override
public List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId) {
public List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) {
List<Long> mpList = new ArrayList<Long>(); List<Long> mpList = new ArrayList<Long>();
if(userInfo.isFmSuperAdmin() || if(userInfo.isFmSuperAdmin() ||
userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
List<MallPermission> mps = getAllMenuListByParentId(parentId, null);
List<MallPermission> mps = getAllMenuListByParentId(parentId, null, boolNav);
mps.stream().forEach(mp->{ mps.stream().forEach(mp->{
mpList.add(mp.getId()); mpList.add(mp.getId());
}); });
return mpList; return mpList;
} else { } else {
List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId());
List<MallPermission> mps = getAllMenuListByParentId(parentId, menuIdList);
List<MallPermission> mps = getAllMenuListByParentId(parentId, menuIdList, boolNav);
mps.stream().forEach(mp->{ mps.stream().forEach(mp->{
mpList.add(mp.getId()); mpList.add(mp.getId());
}); });
@@ -90,38 +96,31 @@ public class MallPermissionServiceImpl implements MallPermissionService {
} }


@Override @Override
public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId) {
public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav) {
if(userInfo.isFmSuperAdmin()) { if(userInfo.isFmSuperAdmin()) {
// 富茂系统管理员,返回所有菜单 // 富茂系统管理员,返回所有菜单
return getAllMenuListByParentId(parentId, null);
return getAllMenuListByParentId(parentId, null, boolNav);
} }
else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { else if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
// 租户超管 // 租户超管
String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId()); String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId());
JSONArray menuIdList = JSON.parseArray(menus); JSONArray menuIdList = JSON.parseArray(menus);
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class));
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav);
} else { } else {
//用户菜单列表 //用户菜单列表
List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); List<Long> menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId());
return getAllMenuListByParentId(0L, menuIdList);
return getAllMenuListByParentId(0L, menuIdList, boolNav);
} }
} }


/** /**
* 获取所有菜单列表 * 获取所有菜单列表
*/ */
private List<MallPermission> getAllMenuList(List<Long> menuIdList){
return getAllMenuListByParentId(0L, menuIdList);
}

/**
* 获取所有菜单列表
*/
private List<MallPermission> getAllMenuListByParentId(Long parentId, List<Long> menuIdList){
private List<MallPermission> getAllMenuListByParentId(Long parentId, List<Long> menuIdList, boolean boolNav){
//查询根菜单列表 //查询根菜单列表
List<MallPermission> menuList = queryListParentId(parentId, menuIdList);
List<MallPermission> menuList = queryListParentId(parentId, menuIdList, boolNav);
//递归获取子菜单 //递归获取子菜单
getMenuTreeList(menuList, menuIdList);
getMenuTreeList(menuList, menuIdList, boolNav);


return menuList; return menuList;
} }
@@ -129,13 +128,13 @@ public class MallPermissionServiceImpl implements MallPermissionService {
/** /**
* 递归 * 递归
*/ */
private List<MallPermission> getMenuTreeList(List<MallPermission> menuList, List<Long> menuIdList){
private List<MallPermission> getMenuTreeList(List<MallPermission> menuList, List<Long> menuIdList, boolean boolNav){
List<MallPermission> subMenuList = new ArrayList<MallPermission>(); List<MallPermission> subMenuList = new ArrayList<MallPermission>();


for(MallPermission entity : menuList){ for(MallPermission entity : menuList){
//目录 //目录
if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){ if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){
entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList), menuIdList));
entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav));
} }
subMenuList.add(entity); subMenuList.add(entity);
} }


+ 1
- 1
mallinkSysAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java Просмотреть файл

@@ -62,7 +62,7 @@ public class SysMenuController extends BaseController {
public ResultData nav(){ public ResultData nav(){
logger.debug("[" + getIpAddr() + "] MallPermissionController::nav"); logger.debug("[" + getIpAddr() + "] MallPermissionController::nav");
MallUserInfo user = getUser(); MallUserInfo user = getUser();
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L);
List<MallPermission> menuList = mallPermissionService.getUserMenuList(user, 0L, true);
Set<String> permissions = mallUserInfoService.getUserPermissions(user); Set<String> permissions = mallUserInfoService.getUserPermissions(user);
Map map = new HashMap<>(); Map map = new HashMap<>();
map.put("menuList", menuList); map.put("menuList", menuList);


Загрузка…
Отмена
Сохранить