Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
workflow-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
workflow-platform
Commits
2097ec1e
Commit
2097ec1e
authored
May 27, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改部分pom
parent
40844127
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
common-lib/src/main/java/com/mortals/xhx/flowable/task/CompleteTaskReq.java
...n/java/com/mortals/xhx/flowable/task/CompleteTaskReq.java
+2
-2
workflow-manager/src/main/java/com/mortals/xhx/busiz/web/FlowDefinitionApiController.java
...om/mortals/xhx/busiz/web/FlowDefinitionApiController.java
+8
-2
No files found.
common-lib/src/main/java/com/mortals/xhx/flowable/task/CompleteTaskReq.java
View file @
2097ec1e
...
@@ -39,9 +39,9 @@ public class CompleteTaskReq extends BaseTaskReq implements Serializable {
...
@@ -39,9 +39,9 @@ public class CompleteTaskReq extends BaseTaskReq implements Serializable {
private
Map
<
String
,
Object
>
variables
;
private
Map
<
String
,
Object
>
variables
;
/**
/**
*
任务参数
附件 选填
*
附件列表
附件 选填
*/
*/
@ApiModelProperty
(
value
=
"
任务参数
"
)
@ApiModelProperty
(
value
=
"
附件列表
"
)
private
List
<
AttachmentEntity
>
attachments
;
private
List
<
AttachmentEntity
>
attachments
;
...
...
workflow-manager/src/main/java/com/mortals/xhx/busiz/web/FlowDefinitionApiController.java
View file @
2097ec1e
package
com.mortals.xhx.busiz.web
;
package
com.mortals.xhx.busiz.web
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.PageInfo
;
import
com.mortals.framework.model.PageInfo
;
...
@@ -18,6 +19,7 @@ import com.mortals.xhx.feign.flowable.IApiFlowDefinitionFeign;
...
@@ -18,6 +19,7 @@ import com.mortals.xhx.feign.flowable.IApiFlowDefinitionFeign;
import
com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign
;
import
com.mortals.xhx.feign.flowable.IApiFlowInstanceFeign
;
import
com.mortals.xhx.flowable.runtime.StartProcessInstanceReq
;
import
com.mortals.xhx.flowable.runtime.StartProcessInstanceReq
;
import
lombok.extern.apachecommons.CommonsLog
;
import
lombok.extern.apachecommons.CommonsLog
;
import
lombok.extern.slf4j.Slf4j
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.BeanUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.util.ObjectUtils
;
import
org.springframework.util.ObjectUtils
;
...
@@ -38,7 +40,7 @@ import java.util.stream.Collectors;
...
@@ -38,7 +40,7 @@ import java.util.stream.Collectors;
* @date: 2021/8/24 20:28
* @date: 2021/8/24 20:28
*/
*/
@RestController
@RestController
@
CommonsLog
@
Slf4j
@RequestMapping
(
"/api/definition"
)
@RequestMapping
(
"/api/definition"
)
public
class
FlowDefinitionApiController
{
public
class
FlowDefinitionApiController
{
...
@@ -60,6 +62,7 @@ public class FlowDefinitionApiController {
...
@@ -60,6 +62,7 @@ public class FlowDefinitionApiController {
PageInfo
page
=
new
PageInfo
();
PageInfo
page
=
new
PageInfo
();
page
.
setPrePageResult
(-
1
);
page
.
setPrePageResult
(-
1
);
DefinitionDeployRsp
deployRsp
=
new
DefinitionDeployRsp
();
DefinitionDeployRsp
deployRsp
=
new
DefinitionDeployRsp
();
log
.
info
(
"deploy req:{}"
,
JSON
.
toJSONString
(
req
));
try
{
try
{
if
(!
ObjectUtils
.
isEmpty
(
req
.
getPage
()))
{
if
(!
ObjectUtils
.
isEmpty
(
req
.
getPage
()))
{
page
.
setPrePageResult
(
req
.
getPage
().
getPer
()
==
0
?
-
1
:
req
.
getPage
().
getPer
());
page
.
setPrePageResult
(
req
.
getPage
().
getPer
()
==
0
?
-
1
:
req
.
getPage
().
getPer
());
...
@@ -68,7 +71,10 @@ public class FlowDefinitionApiController {
...
@@ -68,7 +71,10 @@ public class FlowDefinitionApiController {
ApiRespPdu
<
Result
<
FlowProcDefPdu
>>
resp
=
apiFlowDefinitionFeign
.
list
(
req
.
getQuery
().
getPlatformSn
(),
page
);
ApiRespPdu
<
Result
<
FlowProcDefPdu
>>
resp
=
apiFlowDefinitionFeign
.
list
(
req
.
getQuery
().
getPlatformSn
(),
page
);
if
(
YesNoEnum
.
NO
.
getValue
()
==
resp
.
getCode
())
{
if
(
YesNoEnum
.
NO
.
getValue
()
==
resp
.
getCode
())
{
log
.
error
(
"获取流程定义列表异常:"
+
resp
.
getMsg
());
log
.
error
(
"获取流程定义列表异常:"
+
resp
.
getMsg
());
throw
new
AppException
(
"获取流程定义列表异常:"
+
resp
.
getMsg
());
rsp
.
setCode
(
ApiRespCodeEnum
.
FAILED
.
getValue
());
rsp
.
setMsg
(
resp
.
getMsg
());
return
rsp
;
// throw new AppException("获取流程定义列表异常:" + resp.getMsg());
}
}
List
<
FlowProcDef
>
collect
=
resp
.
getData
().
getList
().
stream
().
map
(
item
->
{
List
<
FlowProcDef
>
collect
=
resp
.
getData
().
getList
().
stream
().
map
(
item
->
{
...
...
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