【7.0.4】【api】更新resource注解,user service

pull/22/head
fengshuonan 2021-06-20 14:33:41 +08:00
parent 40779be3c4
commit aa4f96088a
5 changed files with 63 additions and 4 deletions

View File

@ -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 {};
}

View File

@ -101,4 +101,11 @@ public @interface GetResource {
*/
@AliasFor(annotation = RequestMapping.class)
RequestMethod[] method() default RequestMethod.GET;
/**
* RequestMapping
*/
@AliasFor(annotation = RequestMapping.class)
String[] produces() default {};
}

View File

@ -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 {};
}

View File

@ -154,6 +154,16 @@ public interface SysUserService extends IService<SysUser>, UserServiceApi {
*/
PageResult<SysUserDTO> findPage(SysUserRequest sysUserRequest);
/**
*
*
* @param sysUserRequest
* @return
* @author fengshuonan
* @date 2020/11/21 15:24
*/
List<SysUserDTO> getUserList(SysUserRequest sysUserRequest);
/**
*
*
@ -228,4 +238,12 @@ public interface SysUserService extends IService<SysUser>, UserServiceApi {
*/
void batchDelete(SysUserRequest sysUserRequest);
/**
* id
*
* @author fengshuonan
* @date 2021/6/20 12:10
*/
List<Long> getAllUserIds();
}

View File

@ -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<SysUserMapper, SysUser> impl
return PageResultFactory.createPageResult(userPage);
}
@Override
public List<SysUserDTO> 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<SysUserMapper, SysUser> impl
}
}
@Override
public List<Long> getAllUserIds() {
LambdaQueryWrapper<SysUser> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
userLambdaQueryWrapper.select(SysUser::getUserId);
userLambdaQueryWrapper.eq(SysUser::getStatusFlag, StatusEnum.ENABLE);
userLambdaQueryWrapper.ne(SysUser::getDelFlag, YesOrNotEnum.Y.getCode());
List<SysUser> list = this.list(userLambdaQueryWrapper);
return list.stream().map(SysUser::getUserId).collect(Collectors.toList());
}
@Override
public UserLoginInfoDTO getUserLoginInfo(String account) {