Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
63f3b964
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 3 年多
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
63f3b964
编写于
4月 29, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
删除无用代码
上级
28a2d25c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
2 addition
and
122 deletion
+2
-122
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+0
-106
backend/src/main/java/io/metersphere/service/WorkspaceService.java
...rc/main/java/io/metersphere/service/WorkspaceService.java
+2
-16
未找到文件。
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
63f3b964
...
...
@@ -23,7 +23,6 @@ import org.springframework.beans.BeanUtils;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.util.CollectionUtils
;
import
javax.annotation.Resource
;
import
java.util.*
;
import
java.util.stream.Collectors
;
...
...
@@ -129,107 +128,6 @@ public class UserService {
userMapper
.
updateByPrimaryKeySelective
(
user
);
}
/*public List<Role> getUserRolesList(String userId) {
UserRoleExample userRoleExample = new UserRoleExample();
userRoleExample.createCriteria().andUserIdEqualTo(userId);
List<UserRole> userRolesList = userRoleMapper.selectByExample(userRoleExample);
List<String> roleIds = userRolesList.stream().map(UserRole::getRoleId).collect(Collectors.toList());
RoleExample roleExample = new RoleExample();
roleExample.createCriteria().andIdIn(roleIds);
return roleMapper.selectByExample(roleExample);
}
public List<UserRoleDTO> getUserRoleList(String userId) {
if (StringUtils.isEmpty(userId)) {
return new ArrayList<>();
}
return convertUserRoleDTO(extUserRoleMapper.getUserRoleHelpList(userId));
}*/
private
List
<
UserRoleDTO
>
convertUserRoleDTO
(
List
<
UserRoleHelpDTO
>
helpDTOList
)
{
StringBuilder
buffer
=
new
StringBuilder
();
Map
<
String
,
UserRoleDTO
>
roleMap
=
new
HashMap
<>();
List
<
UserRoleDTO
>
resultList
=
new
ArrayList
<>();
List
<
UserRoleDTO
>
otherList
=
new
ArrayList
<>();
Set
<
String
>
orgSet
=
new
HashSet
<>();
Set
<
String
>
workspaceSet
=
new
HashSet
<>();
for
(
UserRoleHelpDTO
helpDTO
:
helpDTOList
)
{
UserRoleDTO
userRoleDTO
=
roleMap
.
get
(
helpDTO
.
getSourceId
());
if
(
userRoleDTO
==
null
)
{
userRoleDTO
=
new
UserRoleDTO
();
if
(!
StringUtils
.
isEmpty
(
helpDTO
.
getParentId
()))
{
workspaceSet
.
add
(
helpDTO
.
getParentId
());
userRoleDTO
.
setType
(
"workspace"
);
}
else
{
orgSet
.
add
(
helpDTO
.
getSourceId
());
userRoleDTO
.
setType
(
"organization"
);
}
userRoleDTO
.
setId
(
helpDTO
.
getSourceId
());
userRoleDTO
.
setRoleId
(
helpDTO
.
getRoleId
());
userRoleDTO
.
setName
(
helpDTO
.
getSourceName
());
userRoleDTO
.
setParentId
(
helpDTO
.
getParentId
());
userRoleDTO
.
setDesc
(
helpDTO
.
getRoleName
());
}
else
{
userRoleDTO
.
setDesc
(
userRoleDTO
.
getDesc
()
+
","
+
helpDTO
.
getRoleName
());
}
roleMap
.
put
(
helpDTO
.
getSourceId
(),
userRoleDTO
);
}
if
(!
StringUtils
.
isEmpty
(
buffer
.
toString
()))
{
UserRoleDTO
dto
=
new
UserRoleDTO
();
dto
.
setId
(
"admin"
);
dto
.
setType
(
"admin"
);
dto
.
setDesc
(
buffer
.
toString
());
resultList
.
add
(
dto
);
}
for
(
String
org
:
orgSet
)
{
workspaceSet
.
remove
(
org
);
}
List
<
UserRoleDTO
>
orgWorkSpace
=
new
ArrayList
<>(
roleMap
.
values
());
if
(!
CollectionUtils
.
isEmpty
(
workspaceSet
))
{
for
(
String
orgId
:
workspaceSet
)
{
Organization
organization
=
organizationMapper
.
selectByPrimaryKey
(
orgId
);
if
(
organization
!=
null
)
{
UserRoleDTO
dto
=
new
UserRoleDTO
();
dto
.
setId
(
orgId
);
dto
.
setName
(
organization
.
getName
());
dto
.
setSwitchable
(
false
);
dto
.
setType
(
"organization"
);
orgWorkSpace
.
add
(
dto
);
}
}
}
orgWorkSpace
.
sort
((
o1
,
o2
)
->
{
if
(
o1
.
getParentId
()
==
null
)
{
return
-
1
;
}
if
(
o2
.
getParentId
()
==
null
)
{
return
1
;
}
return
o1
.
getParentId
().
compareTo
(
o2
.
getParentId
());
});
resultList
.
addAll
(
orgWorkSpace
);
resultList
.
addAll
(
otherList
);
return
resultList
;
}
public
void
switchUserRole
(
UserDTO
user
,
String
sign
,
String
sourceId
)
{
User
newUser
=
new
User
();
if
(
StringUtils
.
equals
(
"organization"
,
sign
))
{
...
...
@@ -336,10 +234,6 @@ public class UserService {
return
userMapper
.
countByExample
(
example
)
>
0
;
}
public
List
<
OrganizationMemberDTO
>
getOrganizationMemberDTO
(
QueryOrgMemberRequest
request
)
{
return
extUserRoleMapper
.
getOrganizationMemberDTO
(
request
);
}
/**
* 查询该组织外的其他用户列表
*/
...
...
backend/src/main/java/io/metersphere/service/WorkspaceService.java
浏览文件 @
63f3b964
...
...
@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -59,9 +58,9 @@ public class WorkspaceService {
if
(
workspaceMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
Translator
.
get
(
"workspace_name_already_exists"
));
}
workspace
.
setId
(
UUID
.
randomUUID
().
toString
());
// 设置ID
workspace
.
setId
(
UUID
.
randomUUID
().
toString
());
workspace
.
setCreateTime
(
currentTime
);
workspace
.
setUpdateTime
(
currentTime
);
// 首次 update time
workspace
.
setUpdateTime
(
currentTime
);
workspaceMapper
.
insertSelective
(
workspace
);
}
else
{
workspace
.
setUpdateTime
(
currentTime
);
...
...
@@ -112,19 +111,6 @@ public class WorkspaceService {
}
}
public
void
checkWorkspaceOwnerByTestManager
(
String
workspaceId
)
{
checkWorkspaceIsExist
(
workspaceId
);
SessionUser
user
=
SessionUtils
.
getUser
();
List
<
String
>
wsIds
=
user
.
getUserRoles
().
stream
()
.
filter
(
ur
->
RoleConstants
.
TEST_MANAGER
.
equals
(
ur
.
getRoleId
()))
.
map
(
UserRole:
:
getSourceId
)
.
collect
(
Collectors
.
toList
());
boolean
contains
=
wsIds
.
contains
(
workspaceId
);
if
(!
contains
)
{
MSException
.
throwException
(
Translator
.
get
(
"workspace_does_not_belong_to_user"
));
}
}
public
void
checkWorkspaceOwner
(
String
workspaceId
)
{
checkWorkspaceIsExist
(
workspaceId
);
WorkspaceExample
example
=
new
WorkspaceExample
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录