Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
0728ad91
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,发现更多精彩内容 >>
提交
0728ad91
编写于
2月 19, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
project workspace name check
上级
e5f57dc6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
1 deletion
+21
-1
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
...n/java/io/metersphere/controller/WorkspaceController.java
+1
-1
backend/src/main/java/io/metersphere/service/ProjectService.java
.../src/main/java/io/metersphere/service/ProjectService.java
+13
-0
backend/src/main/java/io/metersphere/service/WorkspaceService.java
...rc/main/java/io/metersphere/service/WorkspaceService.java
+7
-0
未找到文件。
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
浏览文件 @
0728ad91
...
...
@@ -34,7 +34,7 @@ public class WorkspaceController {
@GetMapping
(
"delete/{workspaceId}"
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
public
void
sav
eWorkspace
(
@PathVariable
String
workspaceId
)
{
public
void
delet
eWorkspace
(
@PathVariable
String
workspaceId
)
{
workspaceService
.
checkOwner
(
workspaceId
);
workspaceService
.
deleteWorkspace
(
workspaceId
);
}
...
...
backend/src/main/java/io/metersphere/service/ProjectService.java
浏览文件 @
0728ad91
package
io.metersphere.service
;
import
io.metersphere.base.domain.Project
;
import
io.metersphere.base.domain.ProjectExample
;
import
io.metersphere.base.mapper.ProjectMapper
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.user.SessionUtils
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
...
...
@@ -17,6 +20,16 @@ public class ProjectService {
private
ProjectMapper
projectMapper
;
public
Project
addProject
(
Project
project
)
{
if
(
StringUtils
.
isBlank
(
project
.
getName
()))
{
MSException
.
throwException
(
"Project name cannot be null"
);
}
ProjectExample
example
=
new
ProjectExample
();
example
.
createCriteria
()
.
andWorkspaceIdEqualTo
(
SessionUtils
.
getCurrentWorkspaceId
())
.
andNameEqualTo
(
project
.
getName
());
if
(
projectMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
"The project name already exists"
);
}
project
.
setId
(
UUID
.
randomUUID
().
toString
());
long
createTime
=
System
.
currentTimeMillis
();
project
.
setCreateTime
(
createTime
);
...
...
backend/src/main/java/io/metersphere/service/WorkspaceService.java
浏览文件 @
0728ad91
...
...
@@ -32,6 +32,13 @@ public class WorkspaceService {
long
currentTime
=
System
.
currentTimeMillis
();
if
(
StringUtils
.
isBlank
(
workspace
.
getId
()))
{
WorkspaceExample
example
=
new
WorkspaceExample
();
example
.
createCriteria
()
.
andOrganizationIdEqualTo
(
SessionUtils
.
getCurrentOrganizationId
())
.
andNameEqualTo
(
workspace
.
getName
());
if
(
workspaceMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
"The workspace name already exists"
);
}
workspace
.
setId
(
UUID
.
randomUUID
().
toString
());
// 设置ID
workspace
.
setCreateTime
(
currentTime
);
workspace
.
setUpdateTime
(
currentTime
);
// 首次 update time
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录