From b784175e978b0fcfca8ca8bed7953ae4eacf49e8 Mon Sep 17 00:00:00 2001
From: shiyj <1098226878@qq.com>
Date: 星期一, 02 九月 2019 20:18:58 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/java/com/java110/web/components/MenuComponent.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/MenuComponent.java b/WebService/src/main/java/com/java110/web/components/MenuComponent.java
index 8d0240a..f0abb59 100644
--- a/WebService/src/main/java/com/java110/web/components/MenuComponent.java
+++ b/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;
+ }
}
--
Gitblit v1.8.0