From 151540efdbbeb67e3f5ca4f8cc3007e6a90e2dc9 Mon Sep 17 00:00:00 2001 From: yujt Date: Wed, 2 Sep 2020 09:26:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=AB=AF=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/AppMenuController.java | 8 +- .../controller/v2/AppMenuV2Controller.java | 41 +++++----- .../com/elink/esua/epdc/dao/AppMenuDao.java | 78 +++++++++++-------- .../esua/epdc/service/AppMenuService.java | 11 +++ .../epdc/service/impl/AppMenuServiceImpl.java | 5 ++ .../src/main/resources/mapper/AppMenuDao.xml | 38 +++++++++ 6 files changed, 127 insertions(+), 54 deletions(-) diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java index d7b0d20..ea7c073 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java @@ -114,6 +114,7 @@ public class AppMenuController { * {@link com.elink.esua.epdc.controller.v2.AppMenuV2Controller#select(UserDetail)} * -- modified by yujt on 20200901 */ + @Deprecated @GetMapping("select") public Result> select(UserDetail userDetail) { List list = appMenuService.getUserMenuList(userDetail, null); @@ -127,7 +128,12 @@ public class AppMenuController { * @Author yinzuomei * @Description 首页面板 获取工作端APP菜单 * @Date 2019/11/20 10:43 - **/ + *

+ * 已过时，改用新接口 + * {@link com.elink.esua.epdc.controller.v2.AppMenuV2Controller#indexPanel(String, String)} + * -- modified by yujt on 20200901 + */ + @Deprecated @GetMapping("/indexPanel/{mobile}") public Result> indexPanel(@PathVariable("mobile") String mobile) { return appMenuService.indexPanel(mobile); diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java index d86d7db..c8a12e3 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java @@ -22,7 +22,6 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.AppMenuGroupDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.service.AppMenuService; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +43,14 @@ public class AppMenuV2Controller { @Autowired private AppMenuService appMenuService; - + /** + * 管理端角色修改页面，获取全部菜单 + * + * @param userDetail + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/9/1 17:31 + */ @GetMapping("select") public Result select(UserDetail userDetail) { AppMenuGroupDTO result = appMenuService.getUserMenuListV2(userDetail); @@ -52,26 +58,17 @@ public class AppMenuV2Controller { } /** - * @param mobile - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author yinzuomei - * @Description 首页面板 获取工作端APP菜单 - * @Date 2019/11/20 10:43 - **/ - @GetMapping("/indexPanel/{mobile}") - public Result> indexPanel(@PathVariable("mobile") String mobile) { - return appMenuService.indexPanel(mobile); + * 首页面板 获取工作端、数据端首页菜单 + * + * @param category {@link com.elink.esua.epdc.enums.AppMenuCategoryEnum} + * @param mobile 管理员手机号 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2020/9/1 17:30 + */ + @GetMapping("/indexPanel/${category}/{mobile}") + public Result> indexPanel(@PathVariable("category") String category, @PathVariable("mobile") String mobile) { + return new Result().ok(appMenuService.indexPanel(category, mobile)); } - /** - * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author lpf - * @Description 首页面板 获取数据端APP菜单 - * @Date 2020/03/18 10:42 - **/ - @GetMapping("/analysisIndexPanel/{userId}") - public Result> analysisIndexPanel(@PathVariable("userId") String userId) { - return appMenuService.getAnalysisIndexPanel(userId); - } } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java index 4a748f1..354e130 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java @@ -50,42 +50,58 @@ public interface AppMenuDao extends BaseDao { /** * 获取菜单详细信息 + * * @param id * @return */ AppMenuDTO selectByIdDIY(@Param("id") String id, @Param("language") String language); - /** - * 查询所有菜单列表 - * - * @param type 菜单类型 - * @param language 语言 - */ - List getMenuList(@Param("type") Integer type, @Param("language") String language); - /** - * 查询用户菜单列表 - * - * @param userId 用户ＩＤ - * @param type 菜单类型 - * @param language 语言 - */ - List getUserMenuList(@Param("userId") Long userId, @Param("type") Integer type, @Param("language") String language); + /** + * 查询所有菜单列表 + * + * @param type 菜单类型 + * @param language 语言 + */ + List getMenuList(@Param("type") Integer type, @Param("language") String language); + + /** + * 查询用户菜单列表 + * + * @param userId 用户ＩＤ + * @param type 菜单类型 + * @param language 语言 + */ + List getUserMenuList(@Param("userId") Long userId, @Param("type") Integer type, @Param("language") String language); + + /** + * @param mobile 手机号 + * @return java.util.List + * @Author yinzuomei + * @Description + * @Date 2019/11/20 11:10 + **/ + @Deprecated + List indexPanelByMobile(String mobile); + + /** + * 获取移动端菜单信息 + * + * @param category 菜单类别 + * @param mobile 手机号码 + * @return java.util.List + * @author work@yujt.net.cn + * @date 2020/9/1 17:25 + */ + List indexPanelByMobileAndCategory(@Param("category") String category, @Param("mobile") String mobile); + + /** + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author lpf + * @Description 首页面板 获取数据端APP菜单 + * @Date 2020/03/18 10:42 + **/ + List getAnalysisIndexPanel(String userId); - /** - * @param mobile 手机号 - * @return java.util.List - * @Author yinzuomei - * @Description - * @Date 2019/11/20 11:10 - **/ - List indexPanelByMobile(String mobile); - /** - * @param userId - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @Author lpf - * @Description 首页面板 获取数据端APP菜单 - * @Date 2020/03/18 10:42 - **/ - List getAnalysisIndexPanel(String userId); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java index 473fe2c..34ff9ba 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java @@ -164,4 +164,15 @@ public interface AppMenuService extends BaseService { * @date 2020/9/1 10:58 */ AppMenuGroupDTO getUserMenuListV2(UserDetail userDetail); + + /** + * 获取移动端菜单信息 + * + * @param category 菜单类别 + * @param mobile 手机号码 + * @return java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO> + * @author work@yujt.net.cn + * @date 2020/9/1 17:20 + */ + List indexPanel(String category, String mobile); } diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java index df1bb48..1f2d725 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java @@ -204,6 +204,11 @@ public class AppMenuServiceImpl extends BaseServiceImpl indexPanel(String category, String mobile) { + return this.baseDao.indexPanelByMobileAndCategory(category, mobile); + } + @Override public Result> getAnalysisIndexPanel(String userId) { if (StringUtils.isBlank(userId)) { diff --git a/epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml b/epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml index 9ef1b2c..ed1629a 100644 --- a/epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml +++ b/epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml @@ -124,6 +124,44 @@ AND m.pid != 0 )order by mp.sort asc,mc.sort asc + + +