diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppUserIdMenuDTO.java new file mode 100644 index 000000000..45428d1e5 --- /dev/null +++ b/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; +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 56c8cc563..66f5e7395 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/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); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java index b3ce4de53..fd4a80ef7 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysUserDao.java +++ b/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 { void updateTotalUserGridBatch(@Param("ids") List customerGridIds); void updateTotalUserDepartmentBatch(@Param("ids") List customerDepartmentIds); void updateTotalUserAgencyBatch(@Param("ids") List customerAgencyIds); + + List getAppMenu(AppUserIdMenuDTO dto); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index a2baf92e6..e968c7ab9 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/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 { * @return com.elink.esua.epdc.commons.tools.utils.Result> */ PageData getGroupUserList(Map 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); } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 44a6a9f2f..c3531c89f 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/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 list = baseDao.getAppMenu(dto); + if(list != null && list.size() > 0){ + flag = 1; + } + + return new Result().ok(flag); + } + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml index 3ad3f7058..1fbb6b764 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysUserDao.xml @@ -302,5 +302,17 @@ #{id} + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java index c0025c310..04146ee01 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiSysUserController.java +++ b/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); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index f9bea215f..7bd42e554 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/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 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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 558dfa347..d239d51f4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/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); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java index 117196621..3b4c18741 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/SysUserService.java +++ b/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); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java index 01b491557..8c9b747ef 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java +++ b/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); + } }