diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/ApiResource.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/ApiResource.java index 0f7e574d0..3ad82e84f 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/ApiResource.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/ApiResource.java @@ -98,11 +98,19 @@ public @interface ApiResource { /** * 请求路径(同RequestMapping) */ - @AliasFor(annotation = RequestMapping.class) String[] path() default {}; + @AliasFor(annotation = RequestMapping.class) + String[] path() default {}; /** * 请求的http方法(同RequestMapping) */ - @AliasFor(annotation = RequestMapping.class) RequestMethod[] method() default {}; + @AliasFor(annotation = RequestMapping.class) + RequestMethod[] method() default {}; + + /** + * 同RequestMapping + */ + @AliasFor(annotation = RequestMapping.class) + String[] produces() default {}; } diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/GetResource.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/GetResource.java index e634b8250..12e0d3278 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/GetResource.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/GetResource.java @@ -101,4 +101,11 @@ public @interface GetResource { */ @AliasFor(annotation = RequestMapping.class) RequestMethod[] method() default RequestMethod.GET; + + /** + * 同RequestMapping + */ + @AliasFor(annotation = RequestMapping.class) + String[] produces() default {}; + } diff --git a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/PostResource.java b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/PostResource.java index 704eae66c..ac20a83ee 100644 --- a/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/PostResource.java +++ b/kernel-d-scanner/scanner-api/src/main/java/cn/stylefeng/roses/kernel/scanner/api/annotation/PostResource.java @@ -98,10 +98,19 @@ public @interface PostResource { /** * 请求路径(同RequestMapping) */ - @AliasFor(annotation = RequestMapping.class) String[] path() default {}; + @AliasFor(annotation = RequestMapping.class) + String[] path() default {}; /** * 请求的http方法(同RequestMapping) */ - @AliasFor(annotation = RequestMapping.class) RequestMethod[] method() default RequestMethod.POST; + @AliasFor(annotation = RequestMapping.class) + RequestMethod[] method() default RequestMethod.POST; + + /** + * 同RequestMapping + */ + @AliasFor(annotation = RequestMapping.class) + String[] produces() default {}; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java index e44279c45..202c6143c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java @@ -154,6 +154,16 @@ public interface SysUserService extends IService, UserServiceApi { */ PageResult findPage(SysUserRequest sysUserRequest); + /** + * 查询系统用户 + * + * @param sysUserRequest 查询参数 + * @return 查询分页结果 + * @author fengshuonan + * @date 2020/11/21 15:24 + */ + List getUserList(SysUserRequest sysUserRequest); + /** * 导出用户 * @@ -228,4 +238,12 @@ public interface SysUserService extends IService, UserServiceApi { */ void batchDelete(SysUserRequest sysUserRequest); + /** + * 获取所有用户的id + * + * @author fengshuonan + * @date 2021/6/20 12:10 + */ + List getAllUserIds(); + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java index 6950e95aa..df4901be4 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java @@ -42,6 +42,7 @@ import cn.stylefeng.roses.kernel.file.api.FileInfoApi; import cn.stylefeng.roses.kernel.file.api.constants.FileConstants; import cn.stylefeng.roses.kernel.office.api.OfficeExcelApi; import cn.stylefeng.roses.kernel.office.api.pojo.report.ExcelExportParam; +import cn.stylefeng.roses.kernel.rule.enums.StatusEnum; import cn.stylefeng.roses.kernel.rule.enums.TreeNodeEnum; import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum; import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict; @@ -397,6 +398,11 @@ public class SysUserServiceImpl extends ServiceImpl impl return PageResultFactory.createPageResult(userPage); } + @Override + public List getUserList(SysUserRequest sysUserRequest) { + return this.baseMapper.findUserList(sysUserRequest); + } + @Override public void export(HttpServletResponse response) { ExcelExportParam excelExportParam = new ExcelExportParam(); @@ -523,6 +529,17 @@ public class SysUserServiceImpl extends ServiceImpl impl } } + @Override + public List getAllUserIds() { + LambdaQueryWrapper userLambdaQueryWrapper = new LambdaQueryWrapper<>(); + userLambdaQueryWrapper.select(SysUser::getUserId); + userLambdaQueryWrapper.eq(SysUser::getStatusFlag, StatusEnum.ENABLE); + userLambdaQueryWrapper.ne(SysUser::getDelFlag, YesOrNotEnum.Y.getCode()); + + List list = this.list(userLambdaQueryWrapper); + return list.stream().map(SysUser::getUserId).collect(Collectors.toList()); + } + @Override public UserLoginInfoDTO getUserLoginInfo(String account) {