Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzwf
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzwf
提交
1748eb04
提交
1748eb04
编写于
12月 02, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
zhouweidong 部署微服务接口 [ibz-wf,microservice]
上级
8ae26315
变更
9
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
91 行增加
和
29 行删除
+91
-29
.gitignore
.gitignore
+1
-0
WFGroupSearchContext.java
...cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java
+1
-1
WFMemberSearchContext.java
...n/ibizlab/core/workflow/filter/WFMemberSearchContext.java
+1
-1
WFProcessDefinitionSearchContext.java
...ore/workflow/filter/WFProcessDefinitionSearchContext.java
+1
-1
WFSystemSearchContext.java
...n/ibizlab/core/workflow/filter/WFSystemSearchContext.java
+1
-1
WFUserSearchContext.java
.../cn/ibizlab/core/workflow/filter/WFUserSearchContext.java
+1
-1
systemResource.json
ibzwf-core/src/main/resources/permission/systemResource.json
+20
-20
ibzwf.json
ibzwf-core/src/main/resources/sysmodel/ibzwf.json
+22
-0
DTOBase.java
ibzwf-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java
+43
-4
未找到文件。
.gitignore
浏览文件 @
1748eb04
...
@@ -12,3 +12,4 @@
...
@@ -12,3 +12,4 @@
**.iml
**.iml
*.jar
*.jar
*.log
*.log
.DS_Store
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java
浏览文件 @
1748eb04
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFMemberSearchContext.java
浏览文件 @
1748eb04
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFProcessDefinitionSearchContext.java
浏览文件 @
1748eb04
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFSystemSearchContext.java
浏览文件 @
1748eb04
ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFUserSearchContext.java
浏览文件 @
1748eb04
ibzwf-core/src/main/resources/permission/systemResource.json
浏览文件 @
1748eb04
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
],
],
"entities"
:[
"entities"
:[
{
{
"dename"
:
"WF
Task
"
,
"dename"
:
"WF
Group
"
,
"delogicname"
:
"
工作流任务
"
,
"delogicname"
:
"
角色/用户组
"
,
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
...
@@ -20,16 +20,8 @@
...
@@ -20,16 +20,8 @@
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
},
{
"id"
:
"curorg"
,
"name"
:
"当前单位"
},{
"id"
:
"porg"
,
"name"
:
"上级单位"
},{
"id"
:
"sorg"
,
"name"
:
"下级单位"
}
]
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
},
{
"id"
:
"curorg"
,
"name"
:
"当前单位"
},{
"id"
:
"porg"
,
"name"
:
"上级单位"
},{
"id"
:
"sorg"
,
"name"
:
"下级单位"
}
]
}
}
,
{
,
{
"dename"
:
"WFUser"
,
"dename"
:
"WFProcessDefinition"
,
"delogicname"
:
"用户"
,
"delogicname"
:
"流程定义"
,
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
},
{
"id"
:
"curorg"
,
"name"
:
"当前单位"
},{
"id"
:
"porg"
,
"name"
:
"上级单位"
},{
"id"
:
"sorg"
,
"name"
:
"下级单位"
}
]
}
,
{
"dename"
:
"WFGroup"
,
"delogicname"
:
"角色/用户组"
,
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
...
@@ -52,13 +44,21 @@
...
@@ -52,13 +44,21 @@
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
}
}
,
{
,
{
"dename"
:
"WF
ProcessDefinition
"
,
"dename"
:
"WF
Task
"
,
"delogicname"
:
"
流程定义
"
,
"delogicname"
:
"
工作流任务
"
,
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
}]
}
}
,
{
"dename"
:
"WFUser"
,
"delogicname"
:
"用户"
,
"sysmoudle"
:{
"id"
:
"WORKFLOW"
,
"name"
:
"workflow"
},
"dedataset"
:[{
"id"
:
"Default"
,
"name"
:
"DEFAULT"
}],
"deaction"
:[{
"id"
:
"Create"
,
"name"
:
"Create"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Update"
,
"name"
:
"Update"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Remove"
,
"name"
:
"Remove"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Get"
,
"name"
:
"Get"
,
"type"
:
"BUILTIN"
},{
"id"
:
"GetDraft"
,
"name"
:
"GetDraft"
,
"type"
:
"BUILTIN"
},{
"id"
:
"CheckKey"
,
"name"
:
"CheckKey"
,
"type"
:
"BUILTIN"
},{
"id"
:
"Save"
,
"name"
:
"Save"
,
"type"
:
"BUILTIN"
}],
"datascope"
:[{
"id"
:
"all"
,
"name"
:
"全部数据"
},
{
"id"
:
"curorg"
,
"name"
:
"当前单位"
},{
"id"
:
"porg"
,
"name"
:
"上级单位"
},{
"id"
:
"sorg"
,
"name"
:
"下级单位"
}
]
}
],
],
"appmenus"
:[
"appmenus"
:[
...
...
ibzwf-core/src/main/resources/sysmodel/ibzwf.json
浏览文件 @
1748eb04
...
@@ -9,6 +9,8 @@
...
@@ -9,6 +9,8 @@
"table_name"
:
"IBZWFGROUP"
,
"table_name"
:
"IBZWFGROUP"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"GROUPID"
,
"fieldname"
:
"GROUPID"
,
...
@@ -72,6 +74,8 @@
...
@@ -72,6 +74,8 @@
"table_name"
:
"IBZWFHISTORY"
,
"table_name"
:
"IBZWFHISTORY"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"HISTID"
,
"fieldname"
:
"HISTID"
,
...
@@ -212,6 +216,8 @@
...
@@ -212,6 +216,8 @@
"table_name"
:
"IBZWFMEMBER"
,
"table_name"
:
"IBZWFMEMBER"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"MEMBERID"
,
"fieldname"
:
"MEMBERID"
,
...
@@ -415,6 +421,8 @@
...
@@ -415,6 +421,8 @@
"table_name"
:
"IBZWFDEFINITION"
,
"table_name"
:
"IBZWFDEFINITION"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"DEFINITIONKEY"
,
"fieldname"
:
"DEFINITIONKEY"
,
...
@@ -569,6 +577,8 @@
...
@@ -569,6 +577,8 @@
"table_name"
:
"IBZWFINSTANCE"
,
"table_name"
:
"IBZWFINSTANCE"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"INSTANCEID"
,
"fieldname"
:
"INSTANCEID"
,
...
@@ -708,6 +718,8 @@
...
@@ -708,6 +718,8 @@
"table_name"
:
"IBZWFNODE"
,
"table_name"
:
"IBZWFNODE"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"NODEID"
,
"fieldname"
:
"NODEID"
,
...
@@ -805,6 +817,8 @@
...
@@ -805,6 +817,8 @@
"table_name"
:
"IBZWFMODEL"
,
"table_name"
:
"IBZWFMODEL"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"MODELID"
,
"fieldname"
:
"MODELID"
,
...
@@ -862,6 +876,8 @@
...
@@ -862,6 +876,8 @@
"table_name"
:
"IBZPSSYSTEM"
,
"table_name"
:
"IBZPSSYSTEM"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"PSSYSTEMID"
,
"fieldname"
:
"PSSYSTEMID"
,
...
@@ -905,6 +921,8 @@
...
@@ -905,6 +921,8 @@
"table_name"
:
"IBZTASK"
,
"table_name"
:
"IBZTASK"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"TASKID"
,
"fieldname"
:
"TASKID"
,
...
@@ -1059,6 +1077,8 @@
...
@@ -1059,6 +1077,8 @@
"table_name"
:
"IBZWFTASKWAY"
,
"table_name"
:
"IBZWFTASKWAY"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"WAYID"
,
"fieldname"
:
"WAYID"
,
...
@@ -1186,6 +1206,8 @@
...
@@ -1186,6 +1206,8 @@
"table_name"
:
"IBZUSER"
,
"table_name"
:
"IBZUSER"
,
"system_id"
:
"ibzwf"
,
"system_id"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"system_name"
:
"ibzwf"
,
"module_id"
:
"workflow"
,
"module_name"
:
"workflow"
,
"fields"
:[
"fields"
:[
{
{
"fieldname"
:
"USERID"
,
"fieldname"
:
"USERID"
,
...
...
ibzwf-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java
浏览文件 @
1748eb04
package
cn
.
ibizlab
.
util
.
domain
;
package
cn
.
ibizlab
.
util
.
domain
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
com.fasterxml.jackson.annotation.JsonAnyGetter
;
import
com.fasterxml.jackson.annotation.JsonAnyGetter
;
import
com.fasterxml.jackson.annotation.JsonAnySetter
;
import
com.fasterxml.jackson.annotation.JsonAnySetter
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.fasterxml.jackson.annotation.JsonIgnore
;
import
com.alibaba.fastjson.annotation.JSONField
;
import
lombok.Data
;
import
cn.ibizlab.util.helper.DEFieldCacheMap
;
import
org.springframework.cglib.beans.BeanMap
;
import
org.springframework.data.annotation.Transient
;
import
org.springframework.util.StringUtils
;
import
java.io.Serializable
;
import
java.io.Serializable
;
import
java.util.HashMap
;
import
java.util.HashMap
;
import
java.util.HashSet
;
import
java.util.HashSet
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.Set
;
import
java.util.Set
;
import
lombok.Data
;
@Data
@Data
public
class
DTOBase
implements
Serializable
{
public
class
DTOBase
implements
Serializable
{
...
@@ -73,9 +77,44 @@ public class DTOBase implements Serializable {
...
@@ -73,9 +77,44 @@ public class DTOBase implements Serializable {
return
extensionparams
;
return
extensionparams
;
}
}
@JsonIgnore
@JSONField
(
serialize
=
false
)
@Transient
private
BeanMap
map
;
private
BeanMap
getMap
()
{
if
(
map
==
null
)
{
map
=
BeanMap
.
create
(
this
);
}
return
map
;
}
public
Object
get
(
String
field
)
{
String
fieldRealName
=
DEFieldCacheMap
.
getFieldRealName
(
this
.
getClass
(),
field
);
if
(!
StringUtils
.
isEmpty
(
fieldRealName
))
{
return
getMap
().
get
(
fieldRealName
);
}
else
{
return
this
.
extensionparams
.
get
(
field
.
toLowerCase
());
}
}
@JsonAnySetter
@JsonAnySetter
public
void
set
(
String
name
,
Object
value
)
{
public
void
set
(
String
field
,
Object
value
)
{
extensionparams
.
put
(
name
.
toLowerCase
(),
value
);
field
=
field
.
toLowerCase
();
String
fieldRealName
=
DEFieldCacheMap
.
getFieldRealName
(
this
.
getClass
(),
field
);
if
(!
StringUtils
.
isEmpty
(
fieldRealName
))
{
if
(
value
==
null
)
{
getMap
().
put
(
fieldRealName
,
null
);
}
else
{
getMap
().
put
(
fieldRealName
,
DEFieldCacheMap
.
fieldValueOf
(
this
.
getClass
(),
fieldRealName
,
value
));
}
}
else
{
this
.
extensionparams
.
put
(
field
.
toLowerCase
(),
value
);
}
}
}
}
}
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录