Browse Source

小程序菜单权限配置

feature/dangjian
wanggongfeng 4 years ago
parent
commit
043a92c70a
  1. 27
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java
  2. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java
  3. 3
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java
  4. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
  5. 17
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java
  6. 12
      esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml
  7. 13
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java
  8. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
  9. 5
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
  10. 10
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java
  11. 6
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

27
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java

@ -0,0 +1,27 @@
package com.elink.esua.epdc.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @program: esua-epdc
* @description: 获取小程序菜单
* @author: wgf
* @create: 2022-03-07 9:15
**/
@Data
public class AppUserIdMenuDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "用户ID")
// @NotBlank(message="用户ID不能为空")
private String userId;
@ApiModelProperty(value = "部门ID")
@NotBlank(message="部门ID不能为空")
private String deptId;
}

14
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java

@ -587,4 +587,18 @@ public class SysUserController {
return sysUserService.selectOpenId(formDto.getUserList());
}
/**
* @describe: 获取小程序菜单
* @author wgf
* @date 2022/3/7 9:44
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("getAppMenu")
public Result getAppMenu(@RequestBody AppUserIdMenuDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto);
return sysUserService.getAppMenu(dto);
}
}

3
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java

@ -9,6 +9,7 @@
package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.AppUserIdMenuDTO;
import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO;
import com.elink.esua.epdc.dto.SysUserDTO;
import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
@ -170,4 +171,6 @@ public interface SysUserDao extends BaseDao<SysUserEntity> {
void updateTotalUserGridBatch(@Param("ids") List<String> customerGridIds);
void updateTotalUserDepartmentBatch(@Param("ids") List<String> customerDepartmentIds);
void updateTotalUserAgencyBatch(@Param("ids") List<String> customerAgencyIds);
List<String> getAppMenu(AppUserIdMenuDTO dto);
}

14
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@ -11,10 +11,7 @@ package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.mybatis.service.BaseService;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.ModifyPwdDTO;
import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO;
import com.elink.esua.epdc.dto.SysUserDTO;
import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.result.UserWorkAndAnalyOpenIdDTO;
import com.elink.esua.epdc.entity.SysUserEntity;
@ -192,4 +189,13 @@ public interface SysUserService extends BaseService<SysUserEntity> {
* @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.SysUserDTO>>
*/
PageData<SysUserDTO> getGroupUserList(Map<String, Object> params);
/**
* @describe: 获取小程序菜单
* @author wgf
* @date 2022/3/7 9:44
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result getAppMenu(AppUserIdMenuDTO dto);
}

17
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -28,10 +28,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dao.*;
import com.elink.esua.epdc.dto.ModifyPwdDTO;
import com.elink.esua.epdc.dto.SysUserAnalysisOpenIdFormDTO;
import com.elink.esua.epdc.dto.SysUserDTO;
import com.elink.esua.epdc.dto.SysUserOpenIdFormDTO;
import com.elink.esua.epdc.dto.*;
import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO;
import com.elink.esua.epdc.dto.epdc.result.UserWorkAndAnalyOpenIdDTO;
@ -734,5 +731,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
return getPageData(list, page.getTotal(), SysUserDTO.class);
}
@Override
public Result getAppMenu(AppUserIdMenuDTO dto) {
// 是否有菜单权限 :0:否;1:是
Integer flag = 0;
List<String> list = baseDao.getAppMenu(dto);
if(list != null && list.size() > 0){
flag = 1;
}
return new Result().ok(flag);
}
}

12
esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml

@ -302,5 +302,17 @@
#{id}
</foreach>
</update>
<select id="getAppMenu" parameterType="com.elink.esua.epdc.dto.AppUserIdMenuDTO" resultType="java.lang.String">
SELECT
sd.name
FROM sys_dept sd
left join sys_dict dict on (sd.ID = dict.dict_value or sd.pid = dict.dict_value) and dict.pid != '0'
where sd.del_flag = 0
and dict.del_flag = 0
and dict.ID is not null
and dict.dict_type = 'xlroute_testrun'
and (sd.ID = #{deptId} or sd.pid = #{deptId})
</select>
</mapper>

13
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java

@ -1,6 +1,7 @@
package com.elink.esua.epdc.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.AppUserIdMenuDTO;
import com.elink.esua.epdc.dto.ModifyPwdDTO;
import com.elink.esua.epdc.service.SysUserService;
import org.springframework.beans.factory.annotation.Autowired;
@ -36,4 +37,16 @@ public class ApiSysUserController {
return sysUserService.modifyPwd(dto);
}
/**
* @describe: 获取小程序菜单
* @author wgf
* @date 2022/3/7 9:44
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping("getAppMenu")
public Result getAppMenu(@RequestBody AppUserIdMenuDTO dto) {
return sysUserService.getAppMenu(dto);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java

@ -151,4 +151,14 @@ public interface AdminFeignClient {
*/
@PostMapping("sys/user/userRelationWorkAndAnalyOpenId")
Result<UserWorkAndAnalyOpenIdDTO> userRelationWorkAndAnalyOpenId(SendMessageFormDTO formDto);
/**
* @describe: 获取小程序菜单
* @author wgf
* @date 2022/3/7 9:44
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
@PostMapping(value="sys/user/getAppMenu", consumes = MediaType.APPLICATION_JSON_VALUE)
Result getAppMenu(AppUserIdMenuDTO dto);
}

5
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java

@ -79,4 +79,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
public Result userRelationWorkAndAnalyOpenId(SendMessageFormDTO formDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "userRelationWorkAndAnalyOpenId",formDto);
}
@Override
public Result getAppMenu(AppUserIdMenuDTO dto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getAppMenu",dto);
}
}

10
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java

@ -1,6 +1,7 @@
package com.elink.esua.epdc.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.AppUserIdMenuDTO;
import com.elink.esua.epdc.dto.ModifyPwdDTO;
/**
@ -18,4 +19,13 @@ public interface SysUserService {
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result modifyPwd(ModifyPwdDTO dto);
/**
* @describe: 获取小程序菜单
* @author wgf
* @date 2022/3/7 9:44
* @param dto
* @return com.elink.esua.epdc.commons.tools.utils.Result
*/
Result getAppMenu(AppUserIdMenuDTO dto);
}

6
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -1,6 +1,7 @@
package com.elink.esua.epdc.service.impl;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.AppUserIdMenuDTO;
import com.elink.esua.epdc.dto.ModifyPwdDTO;
import com.elink.esua.epdc.feign.AdminFeignClient;
import com.elink.esua.epdc.service.SysUserService;
@ -29,4 +30,9 @@ public class SysUserServiceImpl implements SysUserService {
public Result modifyPwd(ModifyPwdDTO dto) {
return adminFeignClient.modifyPwd(dto);
}
@Override
public Result getAppMenu(AppUserIdMenuDTO dto) {
return adminFeignClient.getAppMenu(dto);
}
}

Loading…
Cancel
Save