Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
A
auto-test-case
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
黄承天
auto-test-case
Commits
3b9314ab
提交
3b9314ab
authored
1月 07, 2021
作者:
黄承天
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[feature]
对每个项目增加创建时间与更新时间字段
上级
889c9365
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
38 行增加
和
12 行删除
+38
-12
ProjectDo.java
...in/java/com/zjty/autotest/pojo/dbo/project/ProjectDo.java
+5
-0
ProjectVo.java
...ain/java/com/zjty/autotest/pojo/vo/project/ProjectVo.java
+8
-3
ProjectService.java
src/main/java/com/zjty/autotest/service/ProjectService.java
+18
-7
TransHelper.java
...in/java/com/zjty/autotest/service/helper/TransHelper.java
+7
-2
没有找到文件。
src/main/java/com/zjty/autotest/pojo/dbo/project/ProjectDo.java
浏览文件 @
3b9314ab
...
@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
...
@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
import
lombok.experimental.Accessors
;
import
lombok.experimental.Accessors
;
import
javax.persistence.*
;
import
javax.persistence.*
;
import
java.util.Date
;
@Entity
@Entity
@Accessors
(
chain
=
true
)
@Accessors
(
chain
=
true
)
...
@@ -25,4 +26,8 @@ public class ProjectDo {
...
@@ -25,4 +26,8 @@ public class ProjectDo {
private
String
os
;
private
String
os
;
private
Date
createTime
;
private
Date
updateTime
;
}
}
src/main/java/com/zjty/autotest/pojo/vo/project/ProjectVo.java
浏览文件 @
3b9314ab
package
com
.
zjty
.
autotest
.
pojo
.
vo
.
project
;
package
com
.
zjty
.
autotest
.
pojo
.
vo
.
project
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.zjty.autotest.pojo.vo.report.Report
;
import
com.zjty.autotest.pojo.vo.report.ReportVo
;
import
com.zjty.autotest.pojo.vo.report.ReportVo
;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.AllArgsConstructor
;
...
@@ -30,10 +29,16 @@ public class ProjectVo {
...
@@ -30,10 +29,16 @@ public class ProjectVo {
@ApiModelProperty
(
value
=
"操作系统"
,
position
=
4
)
@ApiModelProperty
(
value
=
"操作系统"
,
position
=
4
)
private
String
os
;
private
String
os
;
@ApiModelProperty
(
value
=
"测试用例数据"
,
position
=
5
)
@ApiModelProperty
(
value
=
"创建时间"
,
position
=
5
)
private
String
createTime
;
@ApiModelProperty
(
value
=
"更新时间"
,
position
=
6
)
private
String
updateTime
;
@ApiModelProperty
(
value
=
"测试用例数据"
,
position
=
7
)
private
List
<
TestCase
>
tests
;
private
List
<
TestCase
>
tests
;
@ApiModelProperty
(
value
=
"测试报告数据"
,
position
=
6
)
@ApiModelProperty
(
value
=
"测试报告数据"
,
position
=
8
)
private
List
<
ReportVo
>
reports
;
private
List
<
ReportVo
>
reports
;
}
}
src/main/java/com/zjty/autotest/service/ProjectService.java
浏览文件 @
3b9314ab
...
@@ -12,7 +12,9 @@ import org.springframework.data.domain.PageRequest;
...
@@ -12,7 +12,9 @@ import org.springframework.data.domain.PageRequest;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
javax.transaction.Transactional
;
import
javax.transaction.Transactional
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Optional
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
import
static
java
.
lang
.
String
.
format
;
import
static
java
.
lang
.
String
.
format
;
...
@@ -35,21 +37,30 @@ public class ProjectService {
...
@@ -35,21 +37,30 @@ public class ProjectService {
@SuppressWarnings
(
"Duplicates"
)
@SuppressWarnings
(
"Duplicates"
)
public
void
save
(
Project
project
)
{
public
void
save
(
Project
project
)
{
String
url
=
project
.
getUrl
();
String
url
=
project
.
getUrl
();
ProjectDo
projectDo
=
transHelper
.
projectDo
(
project
);
Integer
projectDoId
=
projectRepository
.
save
(
projectDo
).
getId
();
if
(
isNull
(
project
.
getId
()))
{
if
(
isNull
(
project
.
getId
()))
{
ProjectDo
projectDo
=
transHelper
.
projectDo
(
project
,
new
Date
(),
new
Date
());
Integer
projectDoId
=
projectRepository
.
save
(
projectDo
).
getId
();
List
<
TestCase
>
tests
=
project
.
getTests
();
List
<
TestCase
>
tests
=
project
.
getTests
();
if
(
nonNull
(
tests
))
{
if
(
nonNull
(
tests
))
{
tests
.
forEach
(
testCase
->
testCaseService
.
save
(
testCase
,
projectDoId
,
url
));
tests
.
forEach
(
testCase
->
testCaseService
.
save
(
testCase
,
projectDoId
,
url
));
}
}
}
else
{
}
else
{
Integer
projectId
=
project
.
getId
();
Integer
projectId
=
project
.
getId
();
testCaseService
.
deleteAllByProjectId
(
projectId
);
Optional
<
ProjectDo
>
projectDoOptional
=
projectRepository
.
findById
(
projectId
);
reportRepository
.
deleteAllByProjectId
(
projectId
);
boolean
exists
=
projectDoOptional
.
isPresent
();
List
<
TestCase
>
tests
=
project
.
getTests
();
if
(
exists
){
if
(
nonNull
(
tests
))
{
ProjectDo
projectDo
=
projectDoOptional
.
get
();
tests
.
forEach
(
testCase
->
testCaseService
.
save
(
testCase
,
projectId
,
url
));
projectRepository
.
save
(
projectDo
.
setUpdateTime
(
new
Date
()));
testCaseService
.
deleteAllByProjectId
(
projectId
);
reportRepository
.
deleteAllByProjectId
(
projectId
);
List
<
TestCase
>
tests
=
project
.
getTests
();
if
(
nonNull
(
tests
))
{
tests
.
forEach
(
testCase
->
testCaseService
.
save
(
testCase
,
projectId
,
url
));
}
}
else
{
throw
new
RuntimeException
(
format
(
"id为[%s]的项目不存在"
));
}
}
}
}
}
}
...
...
src/main/java/com/zjty/autotest/service/helper/TransHelper.java
浏览文件 @
3b9314ab
...
@@ -15,6 +15,7 @@ import com.zjty.autotest.util.TimeUtil;
...
@@ -15,6 +15,7 @@ import com.zjty.autotest.util.TimeUtil;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
java.util.Date
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
java.util.stream.Collectors
;
...
@@ -126,12 +127,14 @@ public class TransHelper {
...
@@ -126,12 +127,14 @@ public class TransHelper {
);
);
}
}
public
ProjectDo
projectDo
(
Project
project
)
{
public
ProjectDo
projectDo
(
Project
project
,
Date
createTime
,
Date
updateTime
)
{
return
new
ProjectDo
(
return
new
ProjectDo
(
project
.
getId
(),
project
.
getId
(),
project
.
getName
(),
project
.
getName
(),
null
,
null
,
project
.
getOs
()
project
.
getOs
(),
createTime
,
updateTime
);
);
}
}
...
@@ -161,6 +164,8 @@ public class TransHelper {
...
@@ -161,6 +164,8 @@ public class TransHelper {
projectDo
.
getName
(),
projectDo
.
getName
(),
null
,
null
,
projectDo
.
getOs
(),
projectDo
.
getOs
(),
TimeUtil
.
getTime
(
projectDo
.
getCreateTime
()),
TimeUtil
.
getTime
(
projectDo
.
getUpdateTime
()),
tests
,
tests
,
reports
reports
);
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论