Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
kt-keystone
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
kt-keystone
Commits
356e4b2d
提交
356e4b2d
authored
2月 23, 2022
作者:
mry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(web): 执行记录的基本操作,优化了Swagger解析
上级
edf256f5
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
193 行增加
和
1 行删除
+193
-1
ExecutionRecord.java
...main/java/org/matrix/database/entity/ExecutionRecord.java
+34
-0
Project.java
...ase/src/main/java/org/matrix/database/entity/Project.java
+3
-0
ExecutionRecordMapper.java
...ava/org/matrix/database/mapper/ExecutionRecordMapper.java
+10
-0
IExecutionRecordService.java
.../org/matrix/database/service/IExecutionRecordService.java
+10
-0
ExecutionRecordImpl.java
...org/matrix/database/service/impl/ExecutionRecordImpl.java
+14
-0
ExecutionRecType.java
kt-base/src/main/java/org/matrix/enums/ExecutionRecType.java
+26
-0
ExecutionRecordController.java
...matrix/autotest/controller/ExecutionRecordController.java
+93
-0
SwaggerController.java
...va/org/matrix/autotest/swaggerData/SwaggerController.java
+3
-1
没有找到文件。
kt-base/src/main/java/org/matrix/database/entity/ExecutionRecord.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
database
.
entity
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModel
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.NoArgsConstructor
;
import
org.matrix.enums.ExecutionRecType
;
/**
* @author mry
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"ExecutionRecord对象"
,
description
=
"执行记录"
)
@TableName
(
autoResultMap
=
true
,
value
=
"kt_execution_record"
)
public
class
ExecutionRecord
extends
BaseEntity
{
@ApiModelProperty
(
"名称"
)
private
String
name
;
@ApiModelProperty
(
"测试任务id"
)
private
Long
testTaskId
;
@ApiModelProperty
(
"用户id"
)
private
Long
userId
;
@ApiModelProperty
(
"执行状态,0:关闭,1:开启"
)
private
ExecutionRecType
status
;
}
kt-base/src/main/java/org/matrix/database/entity/Project.java
浏览文件 @
356e4b2d
...
...
@@ -25,6 +25,9 @@ public class Project extends BaseEntity {
@ApiModelProperty
(
"名称"
)
private
String
name
;
@ApiModelProperty
(
"项目/v2/api-docs地址"
)
private
String
projectUrl
;
@JsonIgnore
@ApiModelProperty
(
"所属的用户id"
)
private
Integer
userId
;
...
...
kt-base/src/main/java/org/matrix/database/mapper/ExecutionRecordMapper.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
database
.
mapper
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
org.matrix.database.entity.ExecutionRecord
;
/**
* @author mry
*/
public
interface
ExecutionRecordMapper
extends
BaseMapper
<
ExecutionRecord
>
{
}
kt-base/src/main/java/org/matrix/database/service/IExecutionRecordService.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
database
.
service
;
import
com.baomidou.mybatisplus.extension.service.IService
;
import
org.matrix.database.entity.ExecutionRecord
;
/**
* @author mry
*/
public
interface
IExecutionRecordService
extends
IService
<
ExecutionRecord
>
{
}
kt-base/src/main/java/org/matrix/database/service/impl/ExecutionRecordImpl.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
database
.
service
.
impl
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
org.matrix.database.entity.ExecutionRecord
;
import
org.matrix.database.mapper.ExecutionRecordMapper
;
import
org.matrix.database.service.IExecutionRecordService
;
import
org.springframework.stereotype.Service
;
/**
* @author mry
*/
@Service
public
class
ExecutionRecordImpl
extends
ServiceImpl
<
ExecutionRecordMapper
,
ExecutionRecord
>
implements
IExecutionRecordService
{
}
kt-base/src/main/java/org/matrix/enums/ExecutionRecType.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
enums
;
import
com.baomidou.mybatisplus.annotation.EnumValue
;
import
lombok.AllArgsConstructor
;
import
lombok.Getter
;
/**
* @author mry
*/
@Getter
@AllArgsConstructor
public
enum
ExecutionRecType
{
/**
* 1,表示正在执行
*/
RUN
(
1
,
"执行"
),
/**
* 0,表示已经停止
*/
STOP
(
0
,
"停止"
);
@EnumValue
private
final
int
code
;
private
final
String
des
;
}
kt-web/src/main/java/org/matrix/autotest/controller/ExecutionRecordController.java
0 → 100644
浏览文件 @
356e4b2d
package
org
.
matrix
.
autotest
.
controller
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.plugins.pagination.Page
;
import
io.swagger.annotations.Api
;
import
io.swagger.annotations.ApiOperation
;
import
org.matrix.database.entity.ExecutionRecord
;
import
org.matrix.database.service.IExecutionRecordService
;
import
org.matrix.database.vo.CommonResult
;
import
org.matrix.database.vo.CommonResultObj
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.util.StringUtils
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.Optional
;
/**
* @author mry
*/
@CrossOrigin
@RestController
@RequestMapping
(
"/executionRecords"
)
@Api
(
tags
=
"对执行记录execution_record的基本操作"
)
public
class
ExecutionRecordController
{
private
final
IExecutionRecordService
executionRecordService
;
public
ExecutionRecordController
(
IExecutionRecordService
executionRecordService
)
{
this
.
executionRecordService
=
executionRecordService
;
}
/**
* 分页查询执行记录
*
* @param pageSize 每页多少条数据
* @param pageNum 当前页数
* @param name 执行记录名称
* @return 分页查询的结果, 执行记录
*/
@ApiOperation
(
"分页查询执行记录"
)
@GetMapping
public
ResponseEntity
<
CommonResultObj
<
Page
<
ExecutionRecord
>>>
findPageExecutionRecord
(
int
pageSize
,
int
pageNum
,
String
name
)
{
Page
<
ExecutionRecord
>
results
=
Optional
.
of
(
executionRecordService
.
page
(
Page
.
of
(
pageNum
,
pageSize
)
,
Wrappers
.
lambdaQuery
(
ExecutionRecord
.
class
)
.
like
(
StringUtils
.
hasLength
(
name
)
,
ExecutionRecord:
:
getName
,
name
))).
orElse
(
new
Page
<>());
return
results
.
getRecords
().
size
()
!=
0
?
CommonResult
.
success
(
results
,
"查询成功"
)
:
CommonResult
.
failed
(
results
,
"查询失败或无数据"
);
}
/**
* 添加执行记录
*
* @param executionRecord 执行记录对象
* @return 添加的执行记录, 以及是否添加成功的提示信息
*/
@ApiOperation
(
"添加执行记录"
)
@PostMapping
public
ResponseEntity
<
CommonResultObj
<
ExecutionRecord
>>
insertExecutionRecord
(
@RequestBody
ExecutionRecord
executionRecord
)
{
return
CommonResult
.
pred
(
executionRecordService:
:
save
,
executionRecord
,
"添加成功"
,
"添加失败"
);
}
/**
* 修改执行记录
*
* @param executionRecord 执行记录对象
* @return 修改的执行记录, 以及是否修改成功的提示信息
*/
@ApiOperation
(
"修改执行记录"
)
@PutMapping
public
ResponseEntity
<
CommonResultObj
<
ExecutionRecord
>>
updateExecutionRecord
(
@RequestBody
ExecutionRecord
executionRecord
)
{
return
CommonResult
.
pred
(
executionRecordService:
:
updateById
,
executionRecord
,
"修改成功"
,
"修改失败"
);
}
/**
* 根据之间id删除执行记录
*
* @param id 执行记录id
* @return 删除的环境id, 以及是否删除成功的提示信息
*/
@ApiOperation
(
"根据主键id删除执行记录"
)
@DeleteMapping
(
"/{id}"
)
public
ResponseEntity
<
CommonResultObj
<
Long
>>
deleteExecutionRecord
(
@PathVariable
Long
id
)
{
return
CommonResult
.
pred
(
executionRecordService:
:
removeById
,
id
,
"删除成功"
,
"删除失败或id不存在"
);
}
}
kt-web/src/main/java/org/matrix/autotest/swaggerData/SwaggerController.java
浏览文件 @
356e4b2d
...
...
@@ -81,6 +81,8 @@ public class SwaggerController {
@SuppressWarnings
(
value
=
"unchecked"
)
Map
<
String
,
String
>
objRequestMaps
=
(
Map
<
String
,
String
>)
objRequest
;
Object
parameters
=
objRequestMaps
.
get
(
"parameters"
);
Object
tags
=
objRequestMaps
.
get
(
"tags"
);
Object
summary
=
objRequestMaps
.
get
(
"summary"
);
List
<
String
>
parameterAllList
=
new
ArrayList
<>();
if
(
parameters
!=
null
)
{
@SuppressWarnings
(
value
=
"all"
)
...
...
@@ -103,7 +105,7 @@ public class SwaggerController {
parameterAllList
.
add
(
"name="
+
name
+
" type="
+
type
+
" in="
+
in
);
}
}
list
.
add
(
"{host="
+
host
+
", basePath="
+
basePath
+
", request="
+
request
+
", methodUrl="
+
methodUrl
+
", parameters="
+
parameterAllList
+
"}"
);
list
.
add
(
"{host="
+
host
+
", basePath="
+
basePath
+
", request="
+
request
+
",
name="
+
tags
+
"-"
+
summary
+
",
methodUrl="
+
methodUrl
+
", parameters="
+
parameterAllList
+
"}"
);
}
}
return
JSON
.
toJSON
(
list
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论