Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyuan
byit-myth-job
Commits
4d4ebfde
Commit
4d4ebfde
authored
Apr 01, 2020
by
guo_minglei@163.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
接口修改参数方式
parent
ff7c5543
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
17 deletions
+11
-17
ApiFlowServiceImpl.java
...c/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
+8
-14
JobUtils.java
...xecutor-plugin/src/main/java/com/byit/utils/JobUtils.java
+3
-3
No files found.
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
View file @
4d4ebfde
...
...
@@ -624,23 +624,16 @@ public class ApiFlowServiceImpl implements ApiFlowService {
public
List
<
RunRecording
>
loadScheduleResult
(
String
param
){
ValidationUtil
.
dataNotBank
(
param
,
"请求参数不允许为空!"
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
param
);
String
startTime
=
jsonObject
.
getStri
ng
(
"startTime"
);
Long
startTime
=
jsonObject
.
getLo
ng
(
"startTime"
);
ValidationUtil
.
dataNotNull
(
startTime
,
"开始时间不允许为空!"
);
String
endTime
=
jsonObject
.
getStri
ng
(
"endTime"
);
Long
endTime
=
jsonObject
.
getLo
ng
(
"endTime"
);
ValidationUtil
.
dataNotNull
(
endTime
,
"结束时间不允许为空!"
);
Date
startDate
=
null
;
Date
endDate
=
null
;
try
{
startDate
=
sdf
.
parse
(
startTime
);
endDate
=
sdf
.
parse
(
endTime
);
//TODO 最长不能超过60天
ValidationUtil
.
isTrueValidation
(
endDate
.
getTime
()
-
startDate
.
getTime
()
>
60
*
24
*
60
*
60
*
1000
,
"查询时间最长为60天!"
);
}
catch
(
ParseException
e
)
{
log
.
error
(
"时间格式不正确, startTime {} endTime {}"
,
startTime
,
endTime
);
ValidationUtil
.
isTrueValidation
(
true
,
"时间格式不符合标准! 例:20200101"
);
}
ValidationUtil
.
isTrueValidation
(
String
.
valueOf
(
startTime
).
length
()
<
13
||
String
.
valueOf
(
endTime
).
length
()
<
13
,
"时间格式必须是毫秒"
);
//TODO 最长不能超过60天
ValidationUtil
.
isTrueValidation
(
endTime
-
startTime
>
60
*
24
*
60
*
60
*
1000
,
"查询时间最长为60天!"
);
//获取工作空间名称
String
workspaceName
=
jsonObject
.
getString
(
"workspaceName"
);
...
...
@@ -671,11 +664,12 @@ public class ApiFlowServiceImpl implements ApiFlowService {
if
(
StringUtils
.
isNotEmpty
(
executeStatus
)){
executeStatusList
=
Arrays
.
asList
(
executeStatus
.
split
(
","
));
}
List
<
RunRecording
>
runRecordList
=
runRecordingMapper
.
findByStartAndEndTime
(
start
Date
.
getTime
(),
endDate
.
getTime
()
,
flowIds
,
scheduleStatusList
,
executeStatusList
);
List
<
RunRecording
>
runRecordList
=
runRecordingMapper
.
findByStartAndEndTime
(
start
Time
,
endTime
,
flowIds
,
scheduleStatusList
,
executeStatusList
);
return
runRecordList
;
}
@Override
public
RunRecordingVo
loadScheduleLog
(
String
param
)
{
ValidationUtil
.
dataNotBank
(
param
,
"请求参数不允许为空!"
);
...
...
byit-myth-executor/myth-executor-plugin/src/main/java/com/byit/utils/JobUtils.java
View file @
4d4ebfde
...
...
@@ -306,15 +306,15 @@ public class JobUtils {
/**
* 获取运行实例接口
* @param startTime 开始时间
yyyyMMdd 格式
* @param endTime 结束时间
yyyyMMdd 格式
* @param startTime 开始时间
毫秒级别时间
* @param endTime 结束时间
毫秒级别时间
* @param workspaceName 工作空间名称
* @param flowName 工作流名称
* @param scheduleStatus 调度状态 1 未开始 2运行中 3暂停 4完成 多个以“,”隔开
* @param executeStatus 执行结果 1 成功 2 失败 3 补批成功 4 补批失败 5.kill 多个以“,”隔开
* @return
*/
public
static
ResponseResult
loadScheduleResult
(
String
startTime
,
Stri
ng
endTime
,
String
workspaceName
,
String
flowName
,
String
scheduleStatus
,
String
executeStatus
){
public
static
ResponseResult
loadScheduleResult
(
Long
startTime
,
Lo
ng
endTime
,
String
workspaceName
,
String
flowName
,
String
scheduleStatus
,
String
executeStatus
){
Map
<
String
,
Object
>
param
=
new
HashMap
<>();
param
.
put
(
"startTime"
,
startTime
);
param
.
put
(
"endTime"
,
endTime
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment