Merge branch 'master' of https://github.com/java110/MicroCommunity

shiyj

2019-09-02 b784175e978b0fcfca8ca8bed7953ae4eacf49e8

 WebService/src/main/java/com/java110/web/components/MenuComponent.java

@@ -1,6 +1,8 @@
package com.java110.web.components;

import com.alibaba.fastjson.JSONArray;
import com.java110.core.context.IPageData;
import com.java110.web.smo.IMenuServiceSMO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
@@ -12,17 +14,42 @@
@Component("menu")
public class MenuComponent {

    @Autowired
    IMenuServiceSMO menuServiceSMOImpl;

    /**
     * 测试版本号
     *
     * @return
     */
    public ResponseEntity<String> getMenus(String msg){
    public ResponseEntity<String> getMenus(IPageData pd) {

        String menuData = "[{'name':'我的菜单','childs':[{'name':'子菜单','href':'http://www.baidu.com'}]},{'name':'我的菜单','childs':[{'name':'子菜单','href':'http://www.baidu.com'}]}]";
       /* String menuData = "[{'id':1,'icon':'fa-desktop','name':'我的菜单','label':'HOT','childs':[" +
                "{'name':'子菜单','href':'http://www.baidu.com'}]}," +
                "{'id':2,'icon':'fa-flask','name':'我的菜单','childs':[],'href':'/doc'}," +
                "{'id':3,'icon':'fa-globe','name':'我的菜单','childs':[{'name':'子菜单','href':'http://www.baidu.com'}]}" +
                "]";

        JSONArray menus = JSONArray.parseArray(menuData);

        return new ResponseEntity<String>(menus.toJSONString(), HttpStatus.OK);

        */
        ResponseEntity<String> responseEntity = null;
        try {
            responseEntity = menuServiceSMOImpl.queryMenusByUserId(pd);
        } catch (Exception e) {
            responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
        } finally {
            return responseEntity;
        }
    }

    public IMenuServiceSMO getMenuServiceSMOImpl() {
        return menuServiceSMOImpl;
    }

    public void setMenuServiceSMOImpl(IMenuServiceSMO menuServiceSMOImpl) {
        this.menuServiceSMOImpl = menuServiceSMOImpl;
    }
}