zhouweidong 部署微服务接口 [ibz-wf，microservice]

.gitignore

@@ -12,3 +12,4 @@
 **.iml
 *.jar
 *.log
+.DS_Store

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFGroupSearchContext.java

@@ -44,7 +44,7 @@ public class WFGroupSearchContext extends QueryWrapperContext<WFGroup> {
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("groupname", query)   
+                     wrapper.like("groupname", query)
             );
 		 }
 	}

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFMemberSearchContext.java

@@ -86,7 +86,7 @@ public class WFMemberSearchContext extends QueryWrapperContext<WFMember> {
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("membername", query)   
+                     wrapper.like("membername", query)
             );
 		 }
 	}

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFProcessDefinitionSearchContext.java

@@ -51,7 +51,7 @@ public class WFProcessDefinitionSearchContext extends QueryWrapperContext<WFProc
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("definitionname", query)   
+                     wrapper.like("definitionname", query)
             );
 		 }
 	}

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFSystemSearchContext.java

@@ -44,7 +44,7 @@ public class WFSystemSearchContext extends QueryWrapperContext<WFSystem> {
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("pssystemname", query)   
+                     wrapper.like("pssystemname", query)
             );
 		 }
 	}

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/filter/WFUserSearchContext.java

@@ -44,7 +44,7 @@ public class WFUserSearchContext extends QueryWrapperContext<WFUser> {
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
             this.getSearchCond().and( wrapper ->
-                     wrapper.like("personname", query)   
+                     wrapper.like("personname", query)
             );
 		 }
 	}

ibzwf-core/src/main/resources/permission/systemResource.json

@@ -4,13 +4,13 @@
     ],
     "entities":[
     {
-    "dename":"WFTask",
-    "delogicname":"工作流任务",
+    "dename":"WFGroup",
+    "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":"全部数据"}]
-     }
+    }
     ,    {
     "dename":"WFMember",
     "delogicname":"成员",
@@ -18,23 +18,15 @@
     "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":"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":"下级单位"} ]
-     }
+    }
     ,    {
-    "dename":"WFGroup",
-    "delogicname":"角色/用户组",
+    "dename":"WFProcessDefinition",
+    "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":"全部数据"}]
-     }
+    }
     ,    {
     "dename":"WFREModel",
     "delogicname":"流程模型",
@@ -42,7 +34,7 @@
     "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":"全部数据"}]
-     }
+    }
     ,    {
     "dename":"WFSystem",
     "delogicname":"系统",
@@ -50,15 +42,23 @@
     "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":"全部数据"}]
-     }
+    }
     ,    {
-    "dename":"WFProcessDefinition",
-    "delogicname":"流程定义",
+    "dename":"WFTask",
+    "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":"全部数据"}]
-     }
+    }
+    ,    {
+    "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":[
             

ibzwf-core/src/main/resources/sysmodel/ibzwf.json

@@ -9,6 +9,8 @@
     "table_name":"IBZWFGROUP",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"GROUPID" ,
@@ -72,6 +74,8 @@
     "table_name":"IBZWFHISTORY",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"HISTID" ,
@@ -212,6 +216,8 @@
     "table_name":"IBZWFMEMBER",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"MEMBERID" ,
@@ -415,6 +421,8 @@
     "table_name":"IBZWFDEFINITION",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"DEFINITIONKEY" ,
@@ -569,6 +577,8 @@
     "table_name":"IBZWFINSTANCE",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"INSTANCEID" ,
@@ -708,6 +718,8 @@
     "table_name":"IBZWFNODE",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"NODEID" ,
@@ -805,6 +817,8 @@
     "table_name":"IBZWFMODEL",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"MODELID" ,
@@ -862,6 +876,8 @@
     "table_name":"IBZPSSYSTEM",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"PSSYSTEMID" ,
@@ -905,6 +921,8 @@
     "table_name":"IBZTASK",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"TASKID" ,
@@ -1059,6 +1077,8 @@
     "table_name":"IBZWFTASKWAY",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"WAYID" ,
@@ -1186,6 +1206,8 @@
     "table_name":"IBZUSER",
     "system_id":"ibzwf",
     "system_name":"ibzwf",
+    "module_id":"workflow",
+    "module_name":"workflow",
     "fields":[
     {
     "fieldname":"USERID" ,

ibzwf-util/src/main/java/cn/ibizlab/util/domain/DTOBase.java

 package cn.ibizlab.util.domain;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.fasterxml.jackson.annotation.JsonAnySetter;
 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.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import lombok.Data;
 
 @Data
 public class DTOBase implements Serializable {
@@ -73,9 +77,44 @@ public class DTOBase implements Serializable {
         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
-    public void set(String name, Object value) {
-        extensionparams.put(name.toLowerCase(), value);
+    public void set(String field, Object 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);
+        }
     }
 }