ibizdev提交

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFGroup.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
+
 /**
  * 实体[角色/用户组]
  */
@@ -80,10 +83,7 @@ public class WFGroup extends EntityMP implements Serializable {
         this.groupscope = groupscope ;
         this.modify("groupscope",groupscope);
     }
-}
-
-
-
 
+}
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFMember.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
+
 /**
  * 实体[成员]
  */
@@ -115,10 +118,21 @@ public class WFMember extends EntityMP implements Serializable {
         this.userid = userid ;
         this.modify("userid",userid);
     }
-}
-
-
 
+    /**
+     * 获取 [组成员标识]
+     */
+    public String getMemberid(){
+        if(ObjectUtils.isEmpty(memberid)){
+            memberid=(String)getDefaultKey(true);
+        }
+        return memberid;
+    }
 
+    @Override
+    public Serializable getDefaultKey(boolean gen) {
+        return DigestUtils.md5DigestAsHex(String.format("%s||%s" ,this.getGroupid(),this.getUserid()).getBytes());
+    }
+}
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessDefinition.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
+
 /**
  * 实体[流程定义]
  */
@@ -141,10 +144,7 @@ public class WFProcessDefinition extends EntityMP implements Serializable {
         this.deploykey = deploykey ;
         this.modify("deploykey",deploykey);
     }
-}
-
-
-
 
+}
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessInstance.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -131,8 +133,3 @@ public class WFProcessInstance extends EntityClient implements Serializable {
 }
 
 
-
-
-
-
-

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -88,8 +90,3 @@ public class WFProcessNode extends EntityClient implements Serializable {
 }
 
 
-
-
-
-
-

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFREModel.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -72,8 +74,3 @@ public class WFREModel extends EntityClient implements Serializable {
 }
 
 
-
-
-
-
-

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFSystem.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
+
 /**
  * 实体[系统]
  */
@@ -57,10 +60,7 @@ public class WFSystem extends EntityMP implements Serializable {
         this.pssystemname = pssystemname ;
         this.modify("pssystemname",pssystemname);
     }
-}
-
-
-
 
+}
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTask.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -118,8 +120,3 @@ public class WFTask extends EntityClient implements Serializable {
 }
 
 
-
-
-
-
-

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFTaskWay.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -146,8 +148,3 @@ public class WFTaskWay extends EntityClient implements Serializable {
 }
 
 
-
-
-
-
-

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFUser.java

@@ -11,6 +11,8 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.DigestUtils;
 import cn.ibizlab.util.domain.EntityBase;
 import cn.ibizlab.util.annotation.DEField;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
@@ -23,6 +25,7 @@ import org.springframework.data.annotation.Transient;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
 
+
 /**
  * 实体[用户]
  */
@@ -73,10 +76,7 @@ public class WFUser extends EntityMP implements Serializable {
         this.displayname = displayname ;
         this.modify("personname",displayname);
     }
-}
-
-
-
 
+}
 
 

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/service/impl/WFMemberServiceImpl.java

@@ -182,7 +182,7 @@ public class WFMemberServiceImpl extends ServiceImpl<WFMemberMapper, WFMember> i
         if(_update.size()>0)
             this.updateBatch(_update);
         if(_create.size()>0)
-            this.createBatch(_create);
+            this.saveBatch(_create);
         if(delIds.size()>0)
             this.removeBatch(delIds);
 	}

ibzwf-util/src/main/resources/application-sys.yml

@@ -81,6 +81,5 @@ ribbon:
 #缓存级别：无缓存(无配置项)、一级缓存(L1)、二级缓存(L2)
 ibiz:
   enablePermissionValid: true
-  cacheLevel: L1 #一级缓存，本地caffeine缓存
-  #cacheLevel: L2 #二级缓存，本地caffeine缓存+Redis缓存
+  cacheLevel: L1 #(L1)一级本地caffeine缓存;(L2)caffeine缓存+Redis缓存