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/controller/MenuController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/controller/MenuController.java b/src/main/java/com/moral/controller/MenuController.java
index 99233e2..b15b7fa 100644
--- a/src/main/java/com/moral/controller/MenuController.java
+++ b/src/main/java/com/moral/controller/MenuController.java
@@ -1,5 +1,7 @@
package com.moral.controller;
+import java.util.Map;
+
import javax.annotation.Resource;
import org.springframework.web.bind.annotation.CrossOrigin;
@@ -12,6 +14,8 @@
import com.moral.common.bean.PageBean;
import com.moral.common.bean.ResultBean;
import com.moral.entity.Menu;
+import com.moral.service.AccountService;
+import com.moral.service.ChannelService;
import com.moral.service.MenuService;
@RestController
@@ -20,6 +24,12 @@
public class MenuController {
@Resource
MenuService menuService;
+
+ @Resource
+ ChannelService channelService;
+
+ @Resource
+ AccountService accountService;
@GetMapping("count-by-example")
public ResultBean<Integer> countByExample(PageBean pageBean) {
@@ -33,9 +43,11 @@
return resultBean;
}
- @GetMapping("page-list")
- public PageBean pageList(PageBean pageBean) {
- return menuService.queryByPageBean(pageBean);
+ @GetMapping("channel-list")
+ public ResultBean getChannelList(String channelName) {
+ ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
+ resultBean.setData(channelService.getChannelList(channelName));
+ return resultBean;
}
@GetMapping("page-allList")
@@ -61,4 +73,10 @@
ResultBean resultBean = new ResultBean(ResultBean.SUCCESS);
return resultBean;
}
+
+ @GetMapping("menu-by-account")
+ public Map<String,Object> getMenuListsByAccountName(String accountName) {
+ Map<String,Object> mapResult = accountService.getMenuListsByAccountName(accountName);
+ return mapResult;
+ }
}
--
Gitblit v1.8.0