gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】后端升级如下： 1、人员、机构、角色、岗位选择器list接口全部升级为page分页接口 2、userCenter控制器增加人员、机构、角色、岗位已选择的字符串数组查询对象数组的接口

pull/123/MERGE
小诺 2023-06-28 00:34:06 +08:00 committed by 俞宝山
parent c2f7e4ebca
commit 3411bb602e
47 changed files with 428 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysOrgApi.java
View File

@ -14,6 +14,7 @@ package vip.xiaonuo.sys.api;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -55,5 +56,5 @@ public interface SysOrgApi {
* @author xuyuxiang
* @date 2022/7/22 14:45
**/
List<JSONObject> orgListSelector(String parentId);
Page<JSONObject> orgListSelector(String parentId);
}

3
snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysPositionApi.java
View File

@ -13,6 +13,7 @@
package vip.xiaonuo.sys.api;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -38,5 +39,5 @@ public interface SysPositionApi {
* @author xuyuxiang
* @date 2022/7/22 14:47
**/
List<JSONObject> positionSelector(String orgId, String searchKey);
Page<JSONObject> positionSelector(String orgId, String searchKey);
}

3
snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java
View File

@ -13,6 +13,7 @@
package vip.xiaonuo.sys.api;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -38,7 +39,7 @@ public interface SysRoleApi {
* @author xuyuxiang
* @date 2022/7/22 14:49
**/
List<JSONObject> roleSelector(String orgId, String category, String searchKey);
Page<JSONObject> roleSelector(String orgId, String category, String searchKey, List<String> dataScopeList);
/**
* 代码生成菜单按钮授权

3
snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysUserApi.java
View File

@ -13,6 +13,7 @@
package vip.xiaonuo.sys.api;
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List;
@ -102,5 +103,5 @@ public interface SysUserApi {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<JSONObject> userSelector(String orgId, String searchKey);
Page<JSONObject> userSelector(String orgId, String searchKey);
}

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/controller/BizOrgController.java
View File

@ -169,7 +169,7 @@ public class BizOrgController {
@ApiOperation("获取人员选择器")
@SaCheckPermission("/biz/org/userSelector")
@GetMapping("/biz/org/userSelector")
public CommonResult<List<BizUser>> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) {
public CommonResult<Page<BizUser>> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) {
return CommonResult.data(bizOrgService.userSelector(bizOrgSelectorUserParam));
}
}

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorOrgListParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizOrgSelectorOrgListParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 父id */
@ApiModelProperty(value = "父id")
private String parentId;

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/param/BizOrgSelectorUserParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizOrgSelectorUserParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 机构id */
@ApiModelProperty(value = "机构id")
private String orgId;

4
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java
View File

@ -86,7 +86,7 @@ public interface BizOrgService extends IService<BizOrg> {
BizOrg queryEntity(String id);
/**
* 获取缓存的所有机构
* 获取所有机构
*
* @author xuyuxiang
* @date 2022/7/25 19:42
@ -123,5 +123,5 @@ public interface BizOrgService extends IService<BizOrg> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<BizUser> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam);
Page<BizUser> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam);
}

9
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java
View File

@ -368,17 +368,18 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
}
@Override
public List<BizUser> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) {
public Page<BizUser> userSelector(BizOrgSelectorUserParam bizOrgSelectorUserParam) {
LambdaQueryWrapper<BizUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
lambdaQueryWrapper.in(BizUser::getOrgId, loginUserDataScope);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
// 只查询部分字段
lambdaQueryWrapper.select(BizUser::getId, BizUser::getOrgId, BizUser::getAccount, BizUser::getName);
lambdaQueryWrapper.select(BizUser::getId, BizUser::getAvatar, BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount,
BizUser::getName, BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate);
if(ObjectUtil.isNotEmpty(bizOrgSelectorUserParam.getOrgId())) {
lambdaQueryWrapper.eq(BizUser::getOrgId, bizOrgSelectorUserParam.getOrgId());
}
@ -386,7 +387,7 @@ public class BizOrgServiceImpl extends ServiceImpl<BizOrgMapper, BizOrg> impleme
lambdaQueryWrapper.like(BizUser::getName, bizOrgSelectorUserParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(BizUser::getSortCode);
return bizUserService.list(lambdaQueryWrapper);
return bizUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
/* ====以下为各种递归方法==== */

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/controller/BizPositionController.java
View File

@ -154,7 +154,7 @@ public class BizPositionController {
@ApiOperation("获取岗位选择器")
@SaCheckPermission("/biz/position/positionSelector")
@GetMapping("/biz/position/positionSelector")
public CommonResult<List<BizPosition>> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) {
public CommonResult<Page<BizPosition>> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) {
return CommonResult.data(bizPositionService.positionSelector(bizPositionSelectorPositionParam));
}
}

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/param/BizPositionSelectorPositionParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizPositionSelectorPositionParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 机构id */
@ApiModelProperty(value = "机构id")
private String orgId;

2
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/BizPositionService.java
View File

@ -100,5 +100,5 @@ public interface BizPositionService extends IService<BizPosition> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<BizPosition> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam);
Page<BizPosition> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam);
}

6
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/position/service/impl/BizPositionServiceImpl.java
View File

@ -230,14 +230,14 @@ public class BizPositionServiceImpl extends ServiceImpl<BizPositionMapper, BizPo
}
@Override
public List<BizPosition> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) {
public Page<BizPosition> positionSelector(BizPositionSelectorPositionParam bizPositionSelectorPositionParam) {
LambdaQueryWrapper<BizPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
lambdaQueryWrapper.in(BizPosition::getOrgId, loginUserDataScope);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
// 查询部分字段
lambdaQueryWrapper.select(BizPosition::getId, BizPosition::getOrgId, BizPosition::getName,
@ -249,6 +249,6 @@ public class BizPositionServiceImpl extends ServiceImpl<BizPositionMapper, BizPo
lambdaQueryWrapper.like(BizPosition::getName, bizPositionSelectorPositionParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(BizPosition::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java
View File

@ -268,7 +268,7 @@ public class BizUserController {
@ApiOperation("获取机构列表选择器")
@SaCheckPermission("/biz/user/orgListSelector")
@GetMapping("/biz/user/orgListSelector")
public CommonResult<List<BizOrg>> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) {
public CommonResult<Page<BizOrg>> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) {
return CommonResult.data(bizUserService.orgListSelector(bizUserSelectorOrgListParam));
}
@ -282,7 +282,7 @@ public class BizUserController {
@ApiOperation("获取岗位选择器")
@SaCheckPermission("/biz/user/positionSelector")
@GetMapping("/biz/user/positionSelector")
public CommonResult<List<BizPosition>> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) {
public CommonResult<Page<BizPosition>> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) {
return CommonResult.data(bizUserService.positionSelector(bizUserSelectorPositionParam));
}
@ -296,7 +296,7 @@ public class BizUserController {
@ApiOperation("获取角色选择器")
@SaCheckPermission("/biz/user/roleSelector")
@GetMapping("/biz/user/roleSelector")
public CommonResult<List<BizUserRoleResult>> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) {
public CommonResult<Page<BizUserRoleResult>> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) {
return CommonResult.data(bizUserService.roleSelector(bizUserSelectorRoleParam));
}
@ -310,7 +310,7 @@ public class BizUserController {
@ApiOperation("获取人员选择器")
@SaCheckPermission("/biz/user/userSelector")
@GetMapping("/biz/user/userSelector")
public CommonResult<List<BizUser>> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) {
public CommonResult<Page<BizUser>> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) {
return CommonResult.data(bizUserService.userSelector(bizUserSelectorUserParam));
}
}

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorOrgListParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizUserSelectorOrgListParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 父id */
@ApiModelProperty(value = "父id")
private String parentId;

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorPositionParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizUserSelectorPositionParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 机构id */
@ApiModelProperty(value = "机构id")
private String orgId;

10
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorRoleParam.java
View File

@ -26,8 +26,16 @@ import lombok.Setter;
@Setter
public class BizUserSelectorRoleParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id", position = 1)
@ApiModelProperty(value = "组织id")
private String orgId;
/** 角色分类 */

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserSelectorUserParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class BizUserSelectorUserParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

8
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java
View File

@ -153,7 +153,7 @@ public interface BizUserService extends IService<BizUser> {
* @author xuyuxiang
* @date 2022/7/22 13:34
**/
List<BizOrg> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam);
Page<BizOrg> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam);
/**
* 获取岗位选择器
@ -161,7 +161,7 @@ public interface BizUserService extends IService<BizUser> {
* @author xuyuxiang
* @date 2022/5/13 21:00
*/
List<BizPosition> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam);
Page<BizPosition> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam);
/**
* 获取角色选择器
@ -169,7 +169,7 @@ public interface BizUserService extends IService<BizUser> {
* @author xuyuxiang
* @date 2022/5/13 21:00
*/
List<BizUserRoleResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam);
Page<BizUserRoleResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam);
/**
* 获取人员选择器
@ -177,5 +177,5 @@ public interface BizUserService extends IService<BizUser> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<BizUser> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam);
Page<BizUser> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam);
}

40
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java
View File

@ -625,14 +625,14 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
}
@Override
public List<BizOrg> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) {
public Page<BizOrg> orgListSelector(BizUserSelectorOrgListParam bizUserSelectorOrgListParam) {
LambdaQueryWrapper<BizOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
lambdaQueryWrapper.in(BizOrg::getId, loginUserDataScope);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
// 查询部分字段
lambdaQueryWrapper.select(BizOrg::getId, BizOrg::getParentId, BizOrg::getName,
@ -644,18 +644,18 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
lambdaQueryWrapper.like(BizOrg::getName, bizUserSelectorOrgListParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(BizOrg::getSortCode);
return bizOrgService.list(lambdaQueryWrapper);
return bizOrgService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<BizPosition> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) {
public Page<BizPosition> positionSelector(BizUserSelectorPositionParam bizUserSelectorPositionParam) {
LambdaQueryWrapper<BizPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
lambdaQueryWrapper.in(BizPosition::getOrgId, loginUserDataScope);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
// 查询部分字段
lambdaQueryWrapper.select(BizPosition::getId, BizPosition::getOrgId, BizPosition::getName,
@ -667,46 +667,44 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
lambdaQueryWrapper.like(BizPosition::getName, bizUserSelectorPositionParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(BizPosition::getSortCode);
return bizPositionService.list(lambdaQueryWrapper);
return bizPositionService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@SuppressWarnings("ALL")
@Override
public List<BizUserRoleResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) {
public Page<BizUserRoleResult> roleSelector(BizUserSelectorRoleParam bizUserSelectorRoleParam) {
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
if(ObjectUtil.isNotEmpty(bizUserSelectorRoleParam.getOrgId())) {
if(loginUserDataScope.contains(bizUserSelectorRoleParam.getOrgId())) {
return sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(),
bizUserSelectorRoleParam.getSearchKey()).stream().map(jsonObject ->
JSONUtil.toBean(jsonObject, BizUserRoleResult.class)).collect(Collectors.toList());
return BeanUtil.toBean(sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(),
bizUserSelectorRoleParam.getSearchKey(), loginUserDataScope), Page.class);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
} else {
return sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(),
bizUserSelectorRoleParam.getSearchKey()).stream().map(jsonObject ->
JSONUtil.toBean(jsonObject, BizUserRoleResult.class)).filter(bizUserRoleResult -> ObjectUtil
.isNotEmpty(bizUserRoleResult.getOrgId()) && loginUserDataScope.contains(bizUserRoleResult.getOrgId()))
.collect(Collectors.toList());
return BeanUtil.toBean(sysRoleApi.roleSelector(bizUserSelectorRoleParam.getOrgId(), bizUserSelectorRoleParam.getCategory(),
bizUserSelectorRoleParam.getSearchKey(), loginUserDataScope), Page.class);
}
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
}
@Override
public List<BizUser> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) {
public Page<BizUser> userSelector(BizUserSelectorUserParam bizUserSelectorUserParam) {
LambdaQueryWrapper<BizUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 校验数据范围
List<String> loginUserDataScope = StpLoginUserUtil.getLoginUserDataScope();
if(ObjectUtil.isNotEmpty(loginUserDataScope)) {
lambdaQueryWrapper.in(BizUser::getOrgId, loginUserDataScope);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
// 只查询部分字段
lambdaQueryWrapper.select(BizUser::getId, BizUser::getOrgId, BizUser::getAccount, BizUser::getName, BizUser::getSortCode);
lambdaQueryWrapper.select(BizUser::getId, BizUser::getAvatar, BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount,
BizUser::getName, BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate);
if(ObjectUtil.isNotEmpty(bizUserSelectorUserParam.getOrgId())) {
lambdaQueryWrapper.eq(BizUser::getOrgId, bizUserSelectorUserParam.getOrgId());
}
@ -714,6 +712,6 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
lambdaQueryWrapper.like(BizUser::getName, bizUserSelectorUserParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(BizUser::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/controller/SysOrgController.java
View File

@ -160,7 +160,7 @@ public class SysOrgController {
@ApiOperationSupport(order = 8)
@ApiOperation("获取用户选择器")
@GetMapping("/sys/org/userSelector")
public CommonResult<List<SysUser>> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) {
public CommonResult<Page<SysUser>> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) {
return CommonResult.data(sysOrgService.userSelector(sysOrgSelectorUserParam));
}
}

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorOrgListParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysOrgSelectorOrgListParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 父id */
@ApiModelProperty(value = "父id")
private String parentId;

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/param/SysOrgSelectorUserParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysOrgSelectorUserParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

7
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/provider/SysOrgApiProvider.java
View File

@ -12,10 +12,12 @@
*/
package vip.xiaonuo.sys.modular.org.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import vip.xiaonuo.sys.api.SysOrgApi;
import vip.xiaonuo.sys.modular.org.entity.SysOrg;
@ -57,10 +59,11 @@ public class SysOrgApiProvider implements SysOrgApi {
return sysOrgService.orgTreeSelector();
}
@SuppressWarnings("ALL")
@Override
public List<JSONObject> orgListSelector(String parentId) {
public Page<JSONObject> orgListSelector(String parentId) {
SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam = new SysOrgSelectorOrgListParam();
sysOrgSelectorOrgListParam.setParentId(parentId);
return sysOrgService.orgListSelector(sysOrgSelectorOrgListParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList());
return BeanUtil.toBean(sysOrgService.orgListSelector(sysOrgSelectorOrgListParam), Page.class);
}
}

6
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/SysOrgService.java
View File

@ -86,7 +86,7 @@ public interface SysOrgService extends IService<SysOrg> {
SysOrg queryEntity(String id);
/**
* 获取缓存的所有组织
* 获取所有组织
*
* @author xuyuxiang
* @date 2022/7/25 19:42
@ -163,7 +163,7 @@ public interface SysOrgService extends IService<SysOrg> {
* @author xuyuxiang
* @date 2022/7/22 13:34
**/
List<SysOrg> orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam);
Page<SysOrg> orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam);
/**
* 获取用户选择器
@ -171,5 +171,5 @@ public interface SysOrgService extends IService<SysOrg> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<SysUser> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam);
Page<SysUser> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam);
}

15
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java
View File

@ -288,7 +288,7 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
}
@Override
public List<SysOrg> orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam) {
public Page<SysOrg> orgListSelector(SysOrgSelectorOrgListParam sysOrgSelectorOrgListParam) {
LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName,
@ -300,15 +300,16 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
lambdaQueryWrapper.like(SysOrg::getName, sysOrgSelectorOrgListParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysOrg::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<SysUser> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) {
public Page<SysUser> userSelector(SysOrgSelectorUserParam sysOrgSelectorUserParam) {
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 只查询部分字段
lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode);
// 如果查询条件为空，则从缓存中查询
lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount,
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
// 如果查询条件为空，则直接查询
if(ObjectUtil.isAllEmpty(sysOrgSelectorUserParam.getOrgId(), sysOrgSelectorUserParam.getSearchKey())) {
return sysUserService.getCachedAllUserSelectorList();
} else {
@ -319,14 +320,14 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
}
if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getSearchKey())) {
lambdaQueryWrapper.like(SysUser::getName, sysOrgSelectorUserParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysUser::getSortCode);
return sysUserService.list(lambdaQueryWrapper);
return sysUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/controller/SysPositionController.java
View File

@ -146,7 +146,7 @@ public class SysPositionController {
@ApiOperationSupport(order = 7)
@ApiOperation("获取职位选择器")
@GetMapping("/sys/position/positionSelector")
public CommonResult<List<SysPosition>> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) {
public CommonResult<Page<SysPosition>> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) {
return CommonResult.data(sysPositionService.positionSelector(sysPositionSelectorPositionParam));
}
}

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/param/SysPositionSelectorPositionParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysPositionSelectorPositionParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

7
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/provider/SysPositionApiProvider.java
View File

@ -12,8 +12,10 @@
*/
package vip.xiaonuo.sys.modular.position.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import vip.xiaonuo.sys.api.SysPositionApi;
import vip.xiaonuo.sys.modular.position.param.SysPositionSelectorPositionParam;
@ -40,11 +42,12 @@ public class SysPositionApiProvider implements SysPositionApi {
return sysPositionService.queryEntity(positionId).getName();
}
@SuppressWarnings("ALL")
@Override
public List<JSONObject> positionSelector(String orgId, String searchKey) {
public Page<JSONObject> positionSelector(String orgId, String searchKey) {
SysPositionSelectorPositionParam sysPositionSelectorPositionParam = new SysPositionSelectorPositionParam();
sysPositionSelectorPositionParam.setOrgId(orgId);
sysPositionSelectorPositionParam.setSearchKey(searchKey);
return sysPositionService.positionSelector(sysPositionSelectorPositionParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList());
return BeanUtil.toBean(sysPositionService.positionSelector(sysPositionSelectorPositionParam), Page.class);
}
}

2
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/SysPositionService.java
View File

@ -108,5 +108,5 @@ public interface SysPositionService extends IService<SysPosition> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<SysPosition> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam);
Page<SysPosition> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam);
}

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/position/service/impl/SysPositionServiceImpl.java
View File

@ -203,7 +203,7 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
}
@Override
public List<SysPosition> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) {
public Page<SysPosition> positionSelector(SysPositionSelectorPositionParam sysPositionSelectorPositionParam) {
LambdaQueryWrapper<SysPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName,
@ -215,6 +215,6 @@ public class SysPositionServiceImpl extends ServiceImpl<SysPositionMapper, SysPo
lambdaQueryWrapper.like(SysPosition::getName, sysPositionSelectorPositionParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysPosition::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/controller/SysRoleController.java
View File

@ -299,7 +299,7 @@ public class SysRoleController {
@ApiOperationSupport(order = 18)
@ApiOperation("获取角色选择器")
@GetMapping("/sys/role/roleSelector")
public CommonResult<List<SysRole>> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) {
public CommonResult<Page<SysRole>> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) {
return CommonResult.data(sysRoleService.roleSelector(sysRoleSelectorRoleParam));
}
@ -312,7 +312,7 @@ public class SysRoleController {
@ApiOperationSupport(order = 19)
@ApiOperation("获取用户选择器")
@GetMapping("/sys/role/userSelector")
public CommonResult<List<SysUser>> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) {
public CommonResult<Page<SysUser>> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) {
return CommonResult.data(sysRoleService.userSelector(sysRoleSelectorUserParam));
}
}

15
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorRoleParam.java
View File

@ -16,6 +16,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 角色选择器参数
*
@ -26,6 +29,14 @@ import lombok.Setter;
@Setter
public class SysRoleSelectorRoleParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;
@ -37,4 +48,8 @@ public class SysRoleSelectorRoleParam {
/** 名称关键词 */
@ApiModelProperty(value = "名称关键词")
private String searchKey;
/** 数据范围信息 */
@ApiModelProperty(value = "数据范围信息")
private List<String> dataScopeList;
}

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/param/SysRoleSelectorUserParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysRoleSelectorUserParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java
View File

@ -12,11 +12,13 @@
*/
package vip.xiaonuo.sys.modular.role.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import vip.xiaonuo.sys.api.SysRoleApi;
@ -65,13 +67,15 @@ public class SysRoleApiProvider implements SysRoleApi {
return sysRoleService.count(new LambdaQueryWrapper<SysRole>().in(SysRole::getOrgId, orgIdList)) > 0;
}
@SuppressWarnings("ALL")
@Override
public List<JSONObject> roleSelector(String orgId, String category, String searchKey) {
public Page<JSONObject> roleSelector(String orgId, String category, String searchKey, List<String> dataScopeList) {
SysRoleSelectorRoleParam sysRoleSelectorRoleParam = new SysRoleSelectorRoleParam();
sysRoleSelectorRoleParam.setOrgId(orgId);
sysRoleSelectorRoleParam.setCategory(category);
sysRoleSelectorRoleParam.setSearchKey(searchKey);
return sysRoleService.roleSelector(sysRoleSelectorRoleParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList());
sysRoleSelectorRoleParam.setDataScopeList(dataScopeList);
return BeanUtil.toBean(sysRoleService.roleSelector(sysRoleSelectorRoleParam), Page.class);
}
@Transactional(rollbackFor = Exception.class)

4
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/SysRoleService.java
View File

@ -182,7 +182,7 @@ public interface SysRoleService extends IService<SysRole> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<SysRole> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam);
Page<SysRole> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam);
/**
* 获取用户选择器
@ -190,5 +190,5 @@ public interface SysRoleService extends IService<SysRole> {
* @author xuyuxiang
* @date 2022/8/22 13:39
**/
List<SysUser> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam);
Page<SysUser> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam);
}

18
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java
View File

@ -428,7 +428,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
}
@Override
public List<SysRole> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) {
public Page<SysRole> roleSelector(SysRoleSelectorRoleParam sysRoleSelectorRoleParam) {
LambdaQueryWrapper<SysRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName,
@ -442,16 +442,20 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
if(ObjectUtil.isNotEmpty(sysRoleSelectorRoleParam.getSearchKey())) {
lambdaQueryWrapper.like(SysRole::getName, sysRoleSelectorRoleParam.getSearchKey());
}
if(ObjectUtil.isNotEmpty(sysRoleSelectorRoleParam.getDataScopeList())) {
lambdaQueryWrapper.in(SysRole::getOrgId, sysRoleSelectorRoleParam.getDataScopeList());
}
lambdaQueryWrapper.orderByAsc(SysRole::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<SysUser> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) {
public Page<SysUser> userSelector(SysRoleSelectorUserParam sysRoleSelectorUserParam) {
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 只查询部分字段
lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode);
// 如果查询条件为空，则从缓存中查询
lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount,
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
// 如果查询条件为空，则直接查询
if(ObjectUtil.isAllEmpty(sysRoleSelectorUserParam.getOrgId(), sysRoleSelectorUserParam.getSearchKey())) {
return sysUserService.getCachedAllUserSelectorList();
} else {
@ -462,14 +466,14 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
}
if (ObjectUtil.isNotEmpty(sysRoleSelectorUserParam.getSearchKey())) {
lambdaQueryWrapper.like(SysUser::getName, sysRoleSelectorUserParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysUser::getSortCode);
return sysUserService.list(lambdaQueryWrapper);
return sysUserService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}

56
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserCenterController.java
View File

@ -25,6 +25,10 @@ import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import vip.xiaonuo.common.annotation.CommonLog;
import vip.xiaonuo.common.pojo.CommonResult;
import vip.xiaonuo.sys.modular.org.entity.SysOrg;
import vip.xiaonuo.sys.modular.position.entity.SysPosition;
import vip.xiaonuo.sys.modular.role.entity.SysRole;
import vip.xiaonuo.sys.modular.user.entity.SysUser;
import vip.xiaonuo.sys.modular.user.param.*;
import vip.xiaonuo.sys.modular.user.result.SysUserMessageDetailResult;
import vip.xiaonuo.sys.modular.user.result.SysUserMessageResult;
@ -294,4 +298,56 @@ public class SysUserCenterController {
public CommonResult<SysUserMessageDetailResult> loginMessageDetail(@Valid SysUserMessageIdParam sysUserMessageIdParam) {
return CommonResult.data(sysUserService.loginMessageDetail(sysUserMessageIdParam));
}
/**
* 根据id集合获取组织集合
*
* @author xuyuxiang
* @date 2022/4/24 20:00
*/
@ApiOperationSupport(order = 18)
@ApiOperation("根据id集合获取组织集合")
@PostMapping("/sys/userCenter/getOrgListByIdList")
public CommonResult<List<SysOrg>> getOrgListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) {
return CommonResult.data(sysUserService.getOrgListByIdList(sysUserIdListParam));
}
/**
* 根据id集合获取用户集合
*
* @author xuyuxiang
* @date 2022/4/24 20:00
*/
@ApiOperationSupport(order = 19)
@ApiOperation("根据id集合获取用户集合")
@PostMapping("/sys/userCenter/getUserListByIdList")
public CommonResult<List<SysUser>> getUserListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) {
return CommonResult.data(sysUserService.getUserListByIdList(sysUserIdListParam));
}
/**
* 根据id集合获取职位集合
*
* @author xuyuxiang
* @date 2022/4/24 20:00
*/
@ApiOperationSupport(order = 20)
@ApiOperation("根据id集合获取职位集合")
@PostMapping("/sys/userCenter/getPositionListByIdList")
public CommonResult<List<SysPosition>> getPositionListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) {
return CommonResult.data(sysUserService.getPositionListByIdList(sysUserIdListParam));
}
/**
* 根据id集合获取角色集合
*
* @author xuyuxiang
* @date 2022/4/24 20:00
*/
@ApiOperationSupport(order = 21)
@ApiOperation("根据id集合获取角色集合")
@PostMapping("/sys/userCenter/getRoleListByIdList")
public CommonResult<List<SysRole>> getRoleListByIdList(@RequestBody @Valid SysUserIdListParam sysUserIdListParam) {
return CommonResult.data(sysUserService.getRoleListByIdList(sysUserIdListParam));
}
}

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java
View File

@ -339,7 +339,7 @@ public class SysUserController {
@ApiOperationSupport(order = 20)
@ApiOperation("获取组织列表选择器")
@GetMapping("/sys/user/orgListSelector")
public CommonResult<List<SysOrg>> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) {
public CommonResult<Page<SysOrg>> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) {
return CommonResult.data(sysUserService.orgListSelector(sysUserSelectorOrgListParam));
}
@ -352,7 +352,7 @@ public class SysUserController {
@ApiOperationSupport(order = 21)
@ApiOperation("获取职位选择器")
@GetMapping("/sys/user/positionSelector")
public CommonResult<List<SysPosition>> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) {
public CommonResult<Page<SysPosition>> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) {
return CommonResult.data(sysUserService.positionSelector(sysUserSelectorPositionParam));
}
@ -365,7 +365,7 @@ public class SysUserController {
@ApiOperationSupport(order = 22)
@ApiOperation("获取角色选择器")
@GetMapping("/sys/user/roleSelector")
public CommonResult<List<SysRole>> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) {
public CommonResult<Page<SysRole>> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) {
return CommonResult.data(sysUserService.roleSelector(sysUserSelectorRoleParam));
}
@ -378,7 +378,7 @@ public class SysUserController {
@ApiOperationSupport(order = 23)
@ApiOperation("获取用户选择器")
@GetMapping("/sys/user/userSelector")
public CommonResult<List<SysUser>> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) {
public CommonResult<Page<SysUser>> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) {
return CommonResult.data(sysUserService.userSelector(sysUserSelectorUserParam));
}
}

37
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserIdListParam.java Normal file
View File

@ -0,0 +1,37 @@
/*
* Copyright [2022] [https://www.xiaonuo.vip]
*
* Snowy采用APACHE LICENSE 2.0开源协议，您在使用过程中，需要注意以下几点：
*
* 1.请不要删除和修改根目录下的LICENSE文件。
* 2.请不要删除和修改Snowy源码头部的版权声明。
* 3.本项目代码可免费商业使用，商业使用请保留源码和相关描述文件的项目出处，作者声明等。
* 4.分发源码时候，请注明软件出处 https://www.xiaonuo.vip
* 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
* 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
*/
package vip.xiaonuo.sys.modular.user.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.List;
/**
* 用户id集合参数
*
* @author xuyuxiang
* @date 2022/4/21 16:13
**/
@Getter
@Setter
public class SysUserIdListParam {
/** id集合 */
@ApiModelProperty(value = "id集合", required = true)
@NotNull(message = "idList不能为空")
private List<String> idList;
}

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorOrgListParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysUserSelectorOrgListParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 父id */
@ApiModelProperty(value = "父id")
private String parentId;

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorPositionParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysUserSelectorPositionParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

10
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorRoleParam.java
View File

@ -26,8 +26,16 @@ import lombok.Setter;
@Setter
public class SysUserSelectorRoleParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id", position = 1)
@ApiModelProperty(value = "组织id")
private String orgId;
/** 角色分类 */

8
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/param/SysUserSelectorUserParam.java
View File

@ -26,6 +26,14 @@ import lombok.Setter;
@Setter
public class SysUserSelectorUserParam {
/** 当前页 */
@ApiModelProperty(value = "当前页码")
private Integer current;
/** 每页条数 */
@ApiModelProperty(value = "每页条数")
private Integer size;
/** 组织id */
@ApiModelProperty(value = "组织id")
private String orgId;

7
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java
View File

@ -12,11 +12,13 @@
*/
package vip.xiaonuo.sys.modular.user.provider;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.springframework.stereotype.Service;
import vip.xiaonuo.common.exception.CommonException;
import vip.xiaonuo.sys.api.SysUserApi;
@ -136,11 +138,12 @@ public class SysUserApiProvider implements SysUserApi {
return result.get();
}
@SuppressWarnings("ALL")
@Override
public List<JSONObject> userSelector(String orgId, String searchKey) {
public Page<JSONObject> userSelector(String orgId, String searchKey) {
SysUserSelectorUserParam sysUserSelectorUserParam = new SysUserSelectorUserParam();
sysUserSelectorUserParam.setOrgId(orgId);
sysUserSelectorUserParam.setSearchKey(searchKey);
return sysUserService.userSelector(sysUserSelectorUserParam).stream().map(JSONUtil::parseObj).collect(Collectors.toList());
return BeanUtil.toBean(sysUserService.userSelector(sysUserSelectorUserParam), Page.class);
}
}

44
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java
View File

@ -381,12 +381,12 @@ public interface SysUserService extends IService<SysUser> {
List<SysUserPositionResult> loginPositionInfo(SysUserIdParam sysUserIdParam);
/**
* 获取缓存的所有用户选择器
* 获取所有用户选择器
*
* @author xuyuxiang
* @date 2022/7/25 19:42
**/
List<SysUser> getCachedAllUserSelectorList();
Page<SysUser> getAllUserSelectorList();
/* ====用户部分所需要用到的选择器==== */
@ -404,7 +404,7 @@ public interface SysUserService extends IService<SysUser> {
* @author xuyuxiang
* @date 2022/7/22 13:34
**/
List<SysOrg> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam);
Page<SysOrg> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam);
/**
* 获取职位选择器
@ -412,7 +412,7 @@ public interface SysUserService extends IService<SysUser> {
* @author xuyuxiang
* @date 2022/5/13 21:00
*/
List<SysPosition> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam);
Page<SysPosition> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam);
/**
* 获取角色选择器
@ -420,7 +420,7 @@ public interface SysUserService extends IService<SysUser> {
* @author xuyuxiang
* @date 2022/5/13 21:00
*/
List<SysRole> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam);
Page<SysRole> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam);
/**
* 获取用户选择器
@ -428,7 +428,7 @@ public interface SysUserService extends IService<SysUser> {
* @author xuyuxiang
* @date 2022/4/24 20:08
*/
List<SysUser> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam);
Page<SysUser> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam);
/**
* 获取登录用户的站内信分页
@ -445,4 +445,36 @@ public interface SysUserService extends IService<SysUser> {
* @date 2022/9/6 17:39
*/
SysUserMessageDetailResult loginMessageDetail(SysUserMessageIdParam sysUserMessageIdParam);
/**
* 根据id集合获取组织集合
*
* @author xuyuxiang
* @date 2023/6/25 11:03
**/
List<SysOrg> getOrgListByIdList(SysUserIdListParam sysUserIdListParam);
/**
* 根据id集合获取用户集合
*
* @author xuyuxiang
* @date 2023/6/25 11:03
**/
List<SysUser> getUserListByIdList(SysUserIdListParam sysUserIdListParam);
/**
* 根据id集合获取职位集合
*
* @author xuyuxiang
* @date 2023/6/25 11:03
**/
List<SysPosition> getPositionListByIdList(SysUserIdListParam sysUserIdListParam);
/**
* 根据id集合获取角色集合
*
* @author xuyuxiang
* @date 2023/6/25 11:03
**/
List<SysRole> getRoleListByIdList(SysUserIdListParam sysUserIdListParam);
}

84
snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -1423,21 +1423,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public List<SysUser> getCachedAllUserSelectorList() {
// 从缓存中取
Object cacheValue = commonCacheOperator.get(USER_CACHE_ALL_KEY);
if(ObjectUtil.isNotEmpty(cacheValue)) {
return JSONUtil.toList(JSONUtil.parseArray(cacheValue), SysUser.class);
}
// 只查询部分字段
List<SysUser> userList = this.list(new LambdaQueryWrapper<SysUser>().select(SysUser::getId, SysUser::getOrgId,
SysUser::getId, SysUser::getPositionId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode)
.orderByAsc(SysUser::getSortCode));
if(ObjectUtil.isNotEmpty(userList)) {
// 更新到缓存
commonCacheOperator.put(USER_CACHE_ALL_KEY, userList);
}
return userList;
public Page<SysUser> getAllUserSelectorList() {
return this.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper<SysUser>().select(SysUser::getId,
SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount, SysUser::getName,
SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate).orderByAsc(SysUser::getSortCode));
}
/* ====用户部分所需要用到的选择器==== */
@ -1452,7 +1441,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
}
@Override
public List<SysOrg> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) {
public Page<SysOrg> orgListSelector(SysUserSelectorOrgListParam sysUserSelectorOrgListParam) {
LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName,
@ -1464,11 +1453,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
lambdaQueryWrapper.like(SysOrg::getName, sysUserSelectorOrgListParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysOrg::getSortCode);
return sysOrgService.list(lambdaQueryWrapper);
return sysOrgService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<SysPosition> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) {
public Page<SysPosition> positionSelector(SysUserSelectorPositionParam sysUserSelectorPositionParam) {
LambdaQueryWrapper<SysPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName,
@ -1480,11 +1469,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
lambdaQueryWrapper.like(SysPosition::getName, sysUserSelectorPositionParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysPosition::getSortCode);
return sysPositionService.list(lambdaQueryWrapper);
return sysPositionService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<SysRole> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) {
public Page<SysRole> roleSelector(SysUserSelectorRoleParam sysUserSelectorRoleParam) {
LambdaQueryWrapper<SysRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName,
SysRole::getCategory, SysRole::getSortCode);
@ -1498,33 +1487,34 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
lambdaQueryWrapper.like(SysRole::getName, sysUserSelectorRoleParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysRole::getSortCode);
return sysRoleService.list(lambdaQueryWrapper);
return sysRoleService.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
@Override
public List<SysUser> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) {
public Page<SysUser> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) {
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 只查询部分字段
lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode);
// 如果查询条件为空，则从缓存中查询
lambdaQueryWrapper.select(SysUser::getId, SysUser::getAvatar, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount,
SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
// 如果查询条件为空，则直接查询
if(ObjectUtil.isAllEmpty(sysUserSelectorUserParam.getOrgId(), sysUserSelectorUserParam.getSearchKey())) {
return this.getCachedAllUserSelectorList();
} else {
if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
// 如果机构id不为空，则查询该机构所在顶级机构下的所有人
List<String> parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService
// 如果机构id不为空，则查询该机构所在顶级机构下的所有人
List<String> parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService
.getCachedAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId);
if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) {
lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList);
} else {
return CollectionUtil.newArrayList();
return new Page<>();
}
}
if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getSearchKey())) {
lambdaQueryWrapper.like(SysUser::getName, sysUserSelectorUserParam.getSearchKey());
}
lambdaQueryWrapper.orderByAsc(SysUser::getSortCode);
return this.list(lambdaQueryWrapper);
return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
}
}
@ -1540,4 +1530,42 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
public SysUserMessageDetailResult loginMessageDetail(SysUserMessageIdParam sysUserMessageIdParam) {
return JSONUtil.toBean(devMessageApi.detail(sysUserMessageIdParam.getId()), SysUserMessageDetailResult.class);
}
@Override
public List<SysOrg> getOrgListByIdList(SysUserIdListParam sysUserIdListParam) {
LambdaQueryWrapper<SysOrg> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysOrg::getId, SysOrg::getParentId, SysOrg::getName, SysOrg::getCategory, SysOrg::getSortCode)
.in(SysOrg::getId, sysUserIdListParam.getIdList()).orderByAsc(SysOrg::getSortCode);
return sysOrgService.list(lambdaQueryWrapper);
}
@Override
public List<SysUser> getUserListByIdList(SysUserIdListParam sysUserIdListParam) {
LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 只查询部分字段
lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getAccount, SysUser::getName, SysUser::getSortCode)
.in(SysUser::getId, sysUserIdListParam.getIdList()).orderByAsc(SysUser::getSortCode);
return this.list(lambdaQueryWrapper);
}
@Override
public List<SysPosition> getPositionListByIdList(SysUserIdListParam sysUserIdListParam) {
LambdaQueryWrapper<SysPosition> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysPosition::getId, SysPosition::getOrgId, SysPosition::getName,
SysPosition::getCategory, SysPosition::getSortCode)
.in(SysPosition::getId, sysUserIdListParam.getIdList()).orderByAsc(SysPosition::getSortCode);
return sysPositionService.list(lambdaQueryWrapper);
}
@Override
public List<SysRole> getRoleListByIdList(SysUserIdListParam sysUserIdListParam) {
LambdaQueryWrapper<SysRole> lambdaQueryWrapper = new LambdaQueryWrapper<>();
// 查询部分字段
lambdaQueryWrapper.select(SysRole::getId, SysRole::getOrgId, SysRole::getName,
SysRole::getCategory, SysRole::getSortCode)
.in(SysRole::getId, sysUserIdListParam.getIdList()).orderByAsc(SysRole::getSortCode);
return sysRoleService.list(lambdaQueryWrapper);
}
}