Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
kt-keystone
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
Matrix
kt-keystone
Commits
2892e4fa
提交
2892e4fa
authored
2月 14, 2022
作者:
mry
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(base): 修改了主键id类型
上级
20acdede
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
13 行增加
和
15 行删除
+13
-15
Action.java
kt-base/src/main/java/org/matrix/database/entity/Action.java
+2
-2
Connect.java
...ase/src/main/java/org/matrix/database/entity/Connect.java
+1
-1
DynamicVariable.java
...main/java/org/matrix/database/entity/DynamicVariable.java
+2
-2
Environment.java
...src/main/java/org/matrix/database/entity/Environment.java
+1
-1
Move.java
kt-base/src/main/java/org/matrix/database/entity/Move.java
+2
-2
Project.java
...ase/src/main/java/org/matrix/database/entity/Project.java
+1
-1
TestCase.java
...se/src/main/java/org/matrix/database/entity/TestCase.java
+2
-2
MoveController.java
...n/java/org/matrix/autotest/controller/MoveController.java
+2
-4
没有找到文件。
kt-base/src/main/java/org/matrix/database/entity/Action.java
浏览文件 @
2892e4fa
...
...
@@ -28,10 +28,10 @@ public class Action extends BaseEntity {
private
String
name
;
@ApiModelProperty
(
"行为ID"
)
private
Integer
moveId
;
private
Long
moveId
;
@ApiModelProperty
(
"项目ID"
)
private
Integer
projectId
;
private
Long
projectId
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
...
...
kt-base/src/main/java/org/matrix/database/entity/Connect.java
浏览文件 @
2892e4fa
...
...
@@ -19,7 +19,7 @@ import org.matrix.actuators.datasource.DataSourceDTO;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"Connect对象"
,
description
=
""
)
@ApiModel
(
value
=
"Connect对象"
,
description
=
"
数据库
"
)
@TableName
(
value
=
"kt_connect"
)
public
class
Connect
extends
BaseEntity
{
...
...
kt-base/src/main/java/org/matrix/database/entity/DynamicVariable.java
浏览文件 @
2892e4fa
...
...
@@ -22,12 +22,12 @@ import org.matrix.enums.DynamicVarType;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"DynamicVariable对象"
,
description
=
""
)
@ApiModel
(
value
=
"DynamicVariable对象"
,
description
=
"
动参
"
)
@TableName
(
value
=
"kt_dynamic_variable"
)
public
class
DynamicVariable
extends
BaseEntity
{
@ApiModelProperty
(
"所属项目"
)
private
Integer
projectId
;
private
Long
projectId
;
@ApiModelProperty
(
"取用字段"
)
private
String
takenField
;
...
...
kt-base/src/main/java/org/matrix/database/entity/Environment.java
浏览文件 @
2892e4fa
...
...
@@ -35,7 +35,7 @@ public class Environment extends BaseEntity {
private
String
parameterName
;
@ApiModelProperty
(
"项目ID"
)
private
Integer
projectId
;
private
Long
projectId
;
@ApiModelProperty
(
"静态变量,以JSON的形式存储,例如({\"name\":\"张三\"})"
)
@TableField
(
typeHandler
=
FastjsonTypeHandler
.
class
)
...
...
kt-base/src/main/java/org/matrix/database/entity/Move.java
浏览文件 @
2892e4fa
...
...
@@ -17,7 +17,7 @@ import lombok.*;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"Move对象"
,
description
=
""
)
@ApiModel
(
value
=
"Move对象"
,
description
=
"
行为
"
)
@TableName
(
value
=
"kt_move"
)
public
class
Move
extends
BaseEntity
{
...
...
@@ -25,7 +25,7 @@ public class Move extends BaseEntity {
private
String
name
;
@ApiModelProperty
(
"所属项目"
)
private
Integer
projectId
;
private
Long
projectId
;
@ApiModelProperty
(
"备注"
)
private
String
remark
;
...
...
kt-base/src/main/java/org/matrix/database/entity/Project.java
浏览文件 @
2892e4fa
...
...
@@ -17,7 +17,7 @@ import lombok.*;
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@ApiModel
(
value
=
"Project对象"
,
description
=
""
)
@ApiModel
(
value
=
"Project对象"
,
description
=
"
项目
"
)
@TableName
(
value
=
"kt_project"
)
public
class
Project
extends
BaseEntity
{
...
...
kt-base/src/main/java/org/matrix/database/entity/TestCase.java
浏览文件 @
2892e4fa
...
...
@@ -18,14 +18,14 @@ import lombok.*;
@AllArgsConstructor
@EqualsAndHashCode
(
callSuper
=
true
)
@TableName
(
"kt_test_case"
)
@ApiModel
(
value
=
"TestCase对象"
,
description
=
""
)
@ApiModel
(
value
=
"TestCase对象"
,
description
=
"
用例
"
)
public
class
TestCase
extends
BaseEntity
{
@ApiModelProperty
(
"名称"
)
private
String
name
;
@ApiModelProperty
(
"所属项目"
)
private
Integer
projectId
;
private
Long
projectId
;
@ApiModelProperty
(
"用例类型 1为http"
)
private
Integer
type
;
...
...
kt-web/src/main/java/org/matrix/autotest/controller/MoveController.java
浏览文件 @
2892e4fa
...
...
@@ -87,9 +87,7 @@ public class MoveController {
.
eq
(
Action:
:
getMoveId
,
moveId
)))
.
orElse
(
new
ArrayList
<>());
MoveAction
ma
=
new
MoveAction
(
move
,
actionList
);
return
ma
!=
null
?
CommonResult
.
success
(
ma
,
"查询成功"
)
:
CommonResult
.
failed
(
ma
,
"查询失败或无数据"
);
return
CommonResult
.
success
(
ma
,
"查询成功"
);
}
/**
...
...
@@ -103,7 +101,7 @@ public class MoveController {
public
ResponseEntity
<
CommonResultObj
<
MoveAction
>>
insertMoveAction
(
@RequestBody
MoveAction
moveAction
)
{
Boolean
moveBoolean
=
Optional
.
of
(
moveService
.
save
(
moveAction
.
getMove
()))
.
orElseThrow
(
GlobalException:
:
new
);
Integer
id
=
Math
.
toIntExact
(
moveAction
.
getMove
().
getId
()
);
Long
id
=
moveAction
.
getMove
().
getId
(
);
if
(
moveAction
.
getAction
().
size
()
!=
0
)
{
for
(
Action
action
:
moveAction
.
getAction
())
{
action
.
setMoveId
(
id
);
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论