Merge branch 'master' of http://git_xt.git.topm.win:8080/wenhongquan/VisualInspection

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/Menu.java

@@ -1,5 +1,7 @@
 package com.xintong.visualinspection.bean;
 
+import java.util.List;
+
 import lombok.Data;
 
 /**
@@ -23,4 +25,6 @@ public class Menu {
 	private Integer sortNo;
 	
 	private Integer status;
+	
+	private List<Menu> childs;
 }

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/MenuController.java

@@ -87,13 +87,13 @@ public class MenuController extends BaseController {
      * @param size
      * @return
      */
-    @SuppressWarnings("unchecked")
-    @RequestMapping(value = "/get/all/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getAllMenu(@PathVariable Integer page,@PathVariable Integer size ){
+
+    @RequestMapping(value = "/get/all",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getAllMenu(){
         try{
-        	PageHelper.startPage(page, size); 
+        
         	List<Menu> menus= menuService.getMenus(new Menu());
-        	return returnResult(0, "获取成功", new PageInfo(menus));
+        	return returnResult(0, "获取成功", menus);
         }catch(Exception e){
         	throw new BusinessException(20001);
         }

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/MenuServiceImpl.java

@@ -1,24 +1,16 @@
 package com.xintong.visualinspection.service.impl;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import org.crsh.shell.impl.command.system.repl;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 import com.xintong.visualinspection.bean.Menu;
-import com.xintong.visualinspection.bean.Permission;
-import com.xintong.visualinspection.bean.User;
-import com.xintong.visualinspection.dao.cluster.UserInfoDao;
 import com.xintong.visualinspection.dao.master.MenuDao;
-import com.xintong.visualinspection.dao.master.PermissionDao;
-import com.xintong.visualinspection.pojo.SimpleGrantedAuthority;
 import com.xintong.visualinspection.service.BaseService;
 import com.xintong.visualinspection.service.MenuService;
 
@@ -39,7 +31,36 @@ public class MenuServiceImpl extends BaseService implements MenuService {
 
 	@Override
 	public List<Menu> getMenus(Menu menu) {
-		return menuDao.getMenu(menu);
+		
+		List<Menu> menus = 	menuDao.getMenu(menu);
+		
+		List<Menu> mlist = 	new ArrayList<>();
+		
+		Map<Integer,List<Menu>> map = new HashMap<>();
+		//找出所有父
+		for (Menu m : menus) {
+			if(m.getParentId()!=null){
+				List<Menu> menuList = map.get(m.getParentId());
+				if(menuList==null){
+					menuList = new ArrayList<>();
+				}
+				menuList.add(m);
+				map.put(m.getParentId(), menuList);
+			}
+		}
+		//找出子
+		for (Integer mid : map.keySet()) {
+			for (Menu m2 : menus) {
+				if(m2.getId()==mid){
+					m2.setChilds(map.get(mid));
+					if(m2.getParentId()==null){
+						mlist.add(m2);
+					}
+				}
+			}
+		}
+		
+		return mlist;
 	}
 
 	@Override