From fdc3b40f19e487604341c661eec471bf9ac45279 Mon Sep 17 00:00:00 2001
From: ZhuDongming <zdm773644075@hotmail.com>
Date: Tue, 12 Nov 2019 20:37:36 +0800
Subject: [PATCH] 修复map-page地图不显示问题
---
src/main/java/com/moral/service/impl/AccountServiceImpl.java | 82 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 79 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/AccountServiceImpl.java b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
index 261adc9..8a842b9 100644
--- a/src/main/java/com/moral/service/impl/AccountServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/AccountServiceImpl.java
@@ -1,12 +1,20 @@
package com.moral.service.impl;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
import static com.moral.common.bean.Constants.IS_DELETE_FALSE;
import static com.moral.common.bean.Constants.IS_DELETE_TRUE;
import static com.moral.common.util.ResourceUtil.getValue;
import static org.apache.commons.lang3.StringUtils.isNumeric;
import static org.springframework.util.ObjectUtils.isEmpty;
-
-import java.util.*;
import javax.annotation.Resource;
@@ -14,18 +22,21 @@
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
import org.springframework.util.ObjectUtils;
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
import com.moral.common.bean.PageBean;
import com.moral.common.exception.BusinessException;
-import com.moral.common.util.Crypto;
import com.moral.common.util.ResourceUtil;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Account;
+import com.moral.entity.Menu;
import com.moral.entity.Organization;
+import com.moral.entity.Role;
import com.moral.mapper.AccountMapper;
+import com.moral.mapper.MenuMapper;
import com.moral.mapper.OrganizationMapper;
import com.moral.service.AccountService;
import com.moral.service.OrganizationService;
@@ -37,6 +48,7 @@
public class AccountServiceImpl implements AccountService {
@Resource
private BCryptPasswordEncoder encoder;
+
@Resource
private AccountMapper accountMapper;
@@ -212,4 +224,68 @@
List<Account> accountList = accountMapper.getAccountList(accountName);
return accountList;
}
+
+ @Override
+ public List<Role> getRolesByAccountName(String accountName) {
+ List<Role> roleList = accountMapper.getRolesByAccountName(accountName);
+ return roleList;
+ }
+
+ @Override
+ public Map<String, Object> getMenuListsByAccountName(String accountName) {
+ List<Menu> menuList=accountMapper.getParentMenuListsByAccountName(accountName);
+ String email=accountMapper.getEmailByAccountName(accountName);
+ Map<String,Object> mapList=new LinkedHashMap<>();
+ Map<String,Object> appMap=new LinkedHashMap<>();
+ appMap.put("name","������������������������");
+ appMap.put("description","������������������������������������������");
+ mapList.put("app",appMap);
+ Map<String,Object> userMap=new LinkedHashMap<>();
+ userMap.put("name",accountName);
+ userMap.put("avatar","./assets/img/zorro.svg");
+ userMap.put("email",email);
+ mapList.put("user",userMap);
+ Map<String,Object> navigationMap=new LinkedHashMap<>();
+ Map<String,Object> navigationChildMap=new LinkedHashMap<>();
+ navigationChildMap.put("text","���������");
+ navigationChildMap.put("link", "/dashboard/workplace");
+ navigationChildMap.put("icon","icon-speedometer");
+ navigationChildMap.put("translate","dashboard_workplace");
+ List<Map> navigationChildList=new ArrayList<>();
+ navigationChildList.add(navigationChildMap);
+ navigationMap.put("text","���������");
+ navigationMap.put("translate","main_navigation");
+ navigationMap.put("group",true);
+ navigationMap.put("children",navigationChildList);
+ Map<String,Object> systemMap=new LinkedHashMap<>();
+ systemMap.put("text","������������");
+ systemMap.put("group",true);
+ List<Map> systemList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(menuList)){
+ for(Menu m:menuList){
+ Map<String,Object> systemChildMap=new LinkedHashMap<>();
+ systemChildMap.put("text",m.getMenuName());
+ systemChildMap.put("icon",m.getMenuIcon());
+ List<Menu> childMenuLists=accountMapper.getChildMenuIdsByAccountName(accountName,m.getId());
+ List<Map> systemSonList=new ArrayList<>();
+ if(!CollectionUtils.isEmpty(childMenuLists)){
+ for(Menu childMenu:childMenuLists){
+ Map<String,Object> systemSonMap=new LinkedHashMap<>();
+ systemSonMap.put("text",childMenu.getMenuName());
+ systemSonMap.put("link",childMenu.getMenuUrl());
+ systemSonList.add(systemSonMap);
+ }
+ }
+ systemChildMap.put("children",systemSonList);
+ systemList.add(systemChildMap);
+ }
+ }
+ systemMap.put("children",systemList);
+ List<Map> list=new ArrayList<>();
+ list.add(navigationMap);
+ list.add(systemMap);
+ mapList.put("menu",list);
+ return mapList;
+ }
+
}
--
Gitblit v1.8.0