ziin/vvDataAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.设置多设备登录配置为 false

Browse Source 
2.修改主播分页查询为XML查询
3.添加查询当前用户部门下所有用户接口
4.新建国家信息实体类
5.添加批量更新主播接口
This commit is contained in:
Ziin
2025-06-23 21:49:21 +08:00
parent 26be7fb12b
commit c547092e6b
12 changed files with 324 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
View File

@@ -27,9 +27,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -169,4 +167,20 @@ public class UserController {
return success(userService.importUserList(list, updateSupport));
}
@GetMapping({"/list-all-simple-dept"})
@Operation(summary = "获取部门下所有用户", description = "只包含被开启的用户，主要用于前端的下拉选项")
public CommonResult<List<UserSimpleRespVO>> getSimpleUserListWithDept(@RequestParam Long deptId) {
// List<AdminUserDO> list = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus());
List<AdminUserDO> list = userService.getUserListByStatusAndDept(CommonStatusEnum.ENABLE.getStatus(),deptId);
List<AdminUserDO> userDOList = new ArrayList<>();
for (AdminUserDO adminUserDO : list) {
if (Objects.equals(deptId, adminUserDO.getDeptId())) {
userDOList.add(adminUserDO);
}
}
// 拼接数据
Map<Long, DeptDO> deptMap = deptService.getDeptMap(
convertList(userDOList, AdminUserDO::getDeptId));
return success(UserConvert.INSTANCE.convertSimpleList(userDOList, deptMap));
}
}

5
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java
View File

@@ -48,4 +48,9 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
return selectList(AdminUserDO::getDeptId, deptIds);
}
default List<AdminUserDO> getUserListByStatusAndDept(Integer status, Long deptId){
return selectList(new LambdaQueryWrapperX<AdminUserDO>()
.eq(AdminUserDO::getStatus, status)
.eq(AdminUserDO::getDeptId, deptId));
}
}

2
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/oauth2/OAuth2TokenServiceImpl.java
View File

@@ -67,7 +67,7 @@ public class OAuth2TokenServiceImpl implements OAuth2TokenService {
@Transactional(rollbackFor = Exception.class)
public OAuth2AccessTokenDO createAccessToken(Long userId, Integer userType, String clientId, List<String> scopes) {
// 在 yaml multiple-device-login = True 时 删除用户上次登录令牌，实现单设备登录
if (multipleDeviceLoginConfig){
if (!multipleDeviceLoginConfig){
removeAccessTokenByUserId(userId);
}
OAuth2ClientDO clientDO = oauth2ClientService.validOAuthClientFromCache(clientId);

1
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java
View File

@@ -207,4 +207,5 @@ public interface AdminUserService {
*/
boolean isPasswordMatch(String rawPassword, String encodedPassword);
List<AdminUserDO> getUserListByStatusAndDept(Integer status, Long deptId);
}

5
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java
View File

@@ -515,6 +515,11 @@ public class AdminUserServiceImpl implements AdminUserService {
// return passwordEncoder.matches(rawPassword, encodedPassword);
}
@Override
public List<AdminUserDO> getUserListByStatusAndDept(Integer status, Long deptId) {
return userMapper.getUserListByStatusAndDept(status,deptId);
}
/**
* 对密码进行加密
*