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
89555e0b
Commit
89555e0b
authored
Mar 02, 2020
by
guominglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
补批工作流api
parent
df90eee3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
121 additions
and
2 deletions
+121
-2
ApiFlowController.java
...h-admin/src/main/java/com/byit/api/ApiFlowController.java
+31
-0
ApiFlowService.java
...-admin/src/main/java/com/byit/service/ApiFlowService.java
+19
-0
ApiFlowServiceImpl.java
...c/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
+71
-2
No files found.
byit-myth-admin/src/main/java/com/byit/api/ApiFlowController.java
View file @
89555e0b
...
...
@@ -121,4 +121,35 @@ public class ApiFlowController {
return
result
;
}
@PostMapping
(
"getLogUrl"
)
@ApiOperation
(
"获取日志文件的url地址"
)
public
String
getLogUrl
(
String
param
){
String
logUrl
=
apiFlowService
.
getLogUrl
(
param
);
return
logUrl
;
}
/**
* 补批节点
* @param param
* @return
*/
@PostMapping
(
"/repairJob"
)
@ApiOperation
(
"补批"
)
public
String
repairJob
(
String
param
){
apiFlowService
.
repairJob
(
param
);
return
"SUCCESS"
;
}
/**
* 补批工作流
* @param param
* @return
*/
@PostMapping
(
"/repairFlow"
)
@ApiOperation
(
"补批工作流"
)
public
String
repairFlow
(
String
param
){
apiFlowService
.
repairFlow
(
param
);
return
"SUCCESS"
;
}
}
byit-myth-admin/src/main/java/com/byit/service/ApiFlowService.java
View file @
89555e0b
...
...
@@ -59,4 +59,23 @@ public interface ApiFlowService {
* @return
*/
List
<
RunRecordingVo
>
loadScheduleResult
(
String
param
);
/**
* 补批
* @param param
*/
void
repairJob
(
String
param
);
/**
* 补批工作流
* @param param
*/
void
repairFlow
(
String
param
);
/**
* 获取运行日志的存放地址
* @param param
* @return
*/
String
getLogUrl
(
String
param
);
}
byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowServiceImpl.java
View file @
89555e0b
...
...
@@ -37,7 +37,7 @@ import java.util.*;
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
ApiFlowServiceImpl
implements
ApiFlowService
{
private
final
static
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
@Resource
private
FlowMapper
flowMapper
;
...
...
@@ -602,7 +602,6 @@ public class ApiFlowServiceImpl implements ApiFlowService {
String
endTime
=
jsonObject
.
getString
(
"endTime"
);
ValidationUtil
.
dataNotNull
(
endTime
,
"结束时间不允许为空!"
);
SimpleDateFormat
sdf
=
new
SimpleDateFormat
(
"yyyyMMdd"
);
Date
startDate
=
null
;
Date
endDate
=
null
;
try
{
...
...
@@ -651,6 +650,76 @@ public class ApiFlowServiceImpl implements ApiFlowService {
return
null
;
}
/**
* runState 补批机制 1 补批当前节点 2 补批当前节点及以下节点
* @param param
*/
@Override
public
void
repairJob
(
String
param
)
{
ValidationUtil
.
dataNotBank
(
param
,
"请求参数不允许为空!"
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
param
);
//获取工作空间名称
String
workspaceName
=
jsonObject
.
getString
(
"workspaceName"
);
ValidationUtil
.
dataNotBank
(
workspaceName
,
"工作空间名称不允许为空!"
);
//获取工作流名称
String
flowName
=
jsonObject
.
getString
(
"flowName"
);
ValidationUtil
.
dataNotBank
(
flowName
,
"工作流名称不允许为空!"
);
//获取节点名称
String
nodeName
=
jsonObject
.
getString
(
"nodeName"
);
ValidationUtil
.
dataNotBank
(
nodeName
,
"节点名称不允许为空!"
);
//获取重跑机制(运行当前节点,或运行当前节点及以下节点)
String
runState
=
jsonObject
.
getString
(
"runState"
);
ValidationUtil
.
dataNotBank
(
runState
,
"补批机制不允许为空!"
);
//获取运行参数
String
runParam
=
jsonObject
.
getString
(
"runParam"
);
//开始校验
Workspace
workspace
=
workspaceMapper
.
getByName
(
workspaceName
);
ValidationUtil
.
dataNotNull
(
workspace
,
workspaceName
+
"工作空间不存在"
);
Flow
flow
=
flowMapper
.
getByWorkSpaceAndName
(
workspace
.
getWorkspaceId
(),
flowName
);
ValidationUtil
.
dataNotNull
(
flow
,
flowName
+
"工作流不存在"
);
Node
node
=
nodeMapper
.
getByNameAndFlow
(
nodeName
,
flow
.
getFlowId
());
ValidationUtil
.
dataNotNull
(
node
,
nodeName
+
"节点不存在"
);
if
(
StringUtils
.
isNotEmpty
(
node
.
getRunParam
())){
ValidationUtil
.
dataNotBank
(
runParam
,
"运行参数不允许为空!"
);
}
}
@Override
public
void
repairFlow
(
String
param
)
{
ValidationUtil
.
dataNotBank
(
param
,
"请求参数不允许为空!"
);
JSONObject
jsonObject
=
JSON
.
parseObject
(
param
);
//获取工作空间名称
String
workspaceName
=
jsonObject
.
getString
(
"workspaceName"
);
ValidationUtil
.
dataNotBank
(
workspaceName
,
"工作空间名称不允许为空!"
);
//获取工作流名称
String
flowName
=
jsonObject
.
getString
(
"flowName"
);
ValidationUtil
.
dataNotBank
(
flowName
,
"工作流名称不允许为空!"
);
//获取补批的日期
String
repairTime
=
jsonObject
.
getString
(
"repairTime"
);
ValidationUtil
.
dataNotBank
(
repairTime
,
"补批日期不允许为空!"
);
try
{
Date
repairDate
=
sdf
.
parse
(
repairTime
);
ValidationUtil
.
isTrueValidation
(!
repairDate
.
before
(
new
Date
()),
"只能补过去时间的批次!"
);
}
catch
(
ParseException
e
)
{
log
.
error
(
"补批日期不符合规范,例:20200101"
);
ValidationUtil
.
isTrueValidation
(
true
,
"补批日期不符合规范,例:20200101"
);
}
//开始校验
Workspace
workspace
=
workspaceMapper
.
getByName
(
workspaceName
);
ValidationUtil
.
dataNotNull
(
workspace
,
workspaceName
+
"工作空间不存在"
);
Flow
flow
=
flowMapper
.
getByWorkSpaceAndName
(
workspace
.
getWorkspaceId
(),
flowName
);
ValidationUtil
.
dataNotNull
(
flow
,
flowName
+
"工作流不存在"
);
}
@Override
public
String
getLogUrl
(
String
param
)
{
return
null
;
}
/**
* 工作流生成新版本
...
...
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