elink-star
/
epdc-cloud-admin-yushan
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

新增获取用户小程序端菜单的接口

feature/yujt_vim
yujt 5 years ago
parent
6e9ab63e58
commit
151540efdb
6 changed files with 127 additions and 54 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
  2. 41
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java
  3. 78
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java
  4. 11
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java
  5. 5
      epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java
  6. 38
      epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml

8
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AppMenuController.java
View File

@ -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<List<AppMenuDTO>> select(UserDetail userDetail) {
List<AppMenuDTO> list = appMenuService.getUserMenuList(userDetail, null);
@ -127,7 +128,12 @@ public class AppMenuController {
* @Author yinzuomei
* @Description 首页面板 获取工作端APP菜单
* @Date 2019/11/20 10:43
**/
* <p>
* 已过时，改用新接口
* {@link com.elink.esua.epdc.controller.v2.AppMenuV2Controller#indexPanel(String, String)}
* -- modified by yujt on 20200901
*/
@Deprecated
@GetMapping("/indexPanel/{mobile}")
public Result<List<EpdcAppIndexPanelResultDTO>> indexPanel(@PathVariable("mobile") String mobile) {
return appMenuService.indexPanel(mobile);

41
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/v2/AppMenuV2Controller.java
View File

@ -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<com.elink.esua.epdc.dto.AppMenuGroupDTO>
* @author work@yujt.net.cn
* @date 2020/9/1 17:31
*/
@GetMapping("select")
public Result<AppMenuGroupDTO> 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<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>>
* @Author yinzuomei
* @Description 首页面板 获取工作端APP菜单
* @Date 2019/11/20 10:43
**/
@GetMapping("/indexPanel/{mobile}")
public Result<List<EpdcAppIndexPanelResultDTO>> 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<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO>>
* @author work@yujt.net.cn
* @date 2020/9/1 17:30
*/
@GetMapping("/indexPanel/${category}/{mobile}")
public Result<List<EpdcAppIndexPanelResultDTO>> 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<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
* @Author lpf
* @Description 首页面板 获取数据端APP菜单
* @Date 2020/03/18 10:42
**/
@GetMapping("/analysisIndexPanel/{userId}")
public Result<List<EpdcAppChildNavResultDTO>> analysisIndexPanel(@PathVariable("userId") String userId) {
return appMenuService.getAnalysisIndexPanel(userId);
}
}

78
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AppMenuDao.java
View File

@ -50,42 +50,58 @@ public interface AppMenuDao extends BaseDao<AppMenuEntity> {
/**
* 获取菜单详细信息
*
* @param id
* @return
*/
AppMenuDTO selectByIdDIY(@Param("id") String id, @Param("language") String language);
/**
* 查询所有菜单列表
*
* @param type 菜单类型
* @param language 语言
*/
List<AppMenuEntity> getMenuList(@Param("type") Integer type, @Param("language") String language);
/**
* 查询用户菜单列表
*
* @param userId 用户ＩＤ
* @param type 菜单类型
* @param language 语言
*/
List<AppMenuEntity> getUserMenuList(@Param("userId") Long userId, @Param("type") Integer type, @Param("language") String language);
/**
* 查询所有菜单列表
*
* @param type 菜单类型
* @param language 语言
*/
List<AppMenuEntity> getMenuList(@Param("type") Integer type, @Param("language") String language);
/**
* 查询用户菜单列表
*
* @param userId 用户ＩＤ
* @param type 菜单类型
* @param language 语言
*/
List<AppMenuEntity> getUserMenuList(@Param("userId") Long userId, @Param("type") Integer type, @Param("language") String language);
/**
* @param mobile 手机号
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>
* @Author yinzuomei
* @Description
* @Date 2019/11/20 11:10
**/
@Deprecated
List<EpdcAppIndexPanelResultDTO> indexPanelByMobile(String mobile);
/**
* 获取移动端菜单信息
*
* @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:25
*/
List<EpdcAppIndexPanelResultDTO> indexPanelByMobileAndCategory(@Param("category") String category, @Param("mobile") String mobile);
/**
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
* @Author lpf
* @Description 首页面板 获取数据端APP菜单
* @Date 2020/03/18 10:42
**/
List<EpdcAppChildNavResultDTO> getAnalysisIndexPanel(String userId);
/**
* @param mobile 手机号
* @return java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcIndexPanelResultDTO>
* @Author yinzuomei
* @Description
* @Date 2019/11/20 11:10
**/
List<EpdcAppIndexPanelResultDTO> indexPanelByMobile(String mobile);
/**
* @param userId
* @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO>>
* @Author lpf
* @Description 首页面板 获取数据端APP菜单
* @Date 2020/03/18 10:42
**/
List<EpdcAppChildNavResultDTO> getAnalysisIndexPanel(String userId);
}

11
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AppMenuService.java
View File

@ -164,4 +164,15 @@ public interface AppMenuService extends BaseService<AppMenuEntity> {
* @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<EpdcAppIndexPanelResultDTO> indexPanel(String category, String mobile);
}

5
epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AppMenuServiceImpl.java
View File

@ -204,6 +204,11 @@ public class AppMenuServiceImpl extends BaseServiceImpl<AppMenuDao, AppMenuEntit
return new Result().ok(indexPanelResultDTOList);
}
@Override
public List<EpdcAppIndexPanelResultDTO> indexPanel(String category, String mobile) {
return this.baseDao.indexPanelByMobileAndCategory(category, mobile);
}
@Override
public Result<List<EpdcAppChildNavResultDTO>> getAnalysisIndexPanel(String userId) {
if (StringUtils.isBlank(userId)) {

38
epdc-cloud-admin/src/main/resources/mapper/AppMenuDao.xml
View File

@ -124,6 +124,44 @@
AND m.pid != 0
)order by mp.sort asc,mc.sort asc
</select>
<select id="indexPanelByMobileAndCategory" resultMap="EpdcIndexPanelResultDTOMap">
SELECT
lp.field_value AS mainLabel,
t.COLUMN_AMOUNT AS columnAmount,
t.BACKGROUND_COLOR AS backgroundColor,
t.CLASS_NAME AS tpClassName,
t.SPARE_CLASS_NAME AS spareClassName,
t.TEMPLATE_CODE AS templateCode,
lc.field_value AS label,
mc.menu_code AS navCode,
mc.class_name AS className,
mc.remark,
mc.icon,
mc.num_flag as numFlag
FROM
sys_app_menu mp
LEFT JOIN sys_language lp ON lp.table_id = mp.id
LEFT JOIN sys_app_menu mc ON mp.id = mc.pid
LEFT JOIN sys_language lc ON lc.table_id = mc.id
LEFT JOIN sys_app_menu_template t ON mp.template_id = t.id
WHERE
mc.id IN (
SELECT
m.id meauId
FROM
sys_user u
LEFT JOIN sys_role_user ru ON ru.user_id = u.id
LEFT JOIN sys_app_role_menu am ON am.role_id = ru.role_id
LEFT JOIN sys_app_menu m ON am.menu_id = m.id
WHERE
u.mobile = #{mobile}
AND m.category =#{category}
AND am.menu_id IS NOT NULL
AND m.pid != 0
)order by mp.sort asc,mc.sort asc
</select>
<resultMap id="AnalysisIndexPanelResultDTOMap" type="com.elink.esua.epdc.dto.epdc.result.EpdcAppChildNavResultDTO">
<id column="label" property="label"/>
<result column="navCode" property="navCode"/>

Write Preview
Loading…
Cancel
Save