ibiz4j 发布系统代码

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgBody.java

@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
 /**
  * 实体[消息]

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgOpenAccess.java

@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
 /**
  * 实体[接入开放平台]

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgTemplate.java

@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
 /**
  * 实体[消息模板]

ibznotify-core/src/main/java/cn/ibizlab/core/notify/domain/MsgUserAccount.java

@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.baomidou.mybatisplus.annotation.*;
 import cn.ibizlab.util.domain.EntityMP;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 
 /**
  * 实体[绑定消息账号]

ibznotify-core/src/main/resources/mapper/notify/msgbody/MsgBodyMapper.xml

@@ -8,7 +8,7 @@
         <![CDATA[select t1.* from (SELECT t1.`CONTENT`, t1.`ERRORINFO`, t1.`ISERROR`, t1.`ISSEND`, t1.`MSGID`, t1.`MSGLINK`, t1.`MSGLINK_PC`, t1.`MSGNAME`, t1.`MSGTYPE`, t1.`SUBJECT`, t1.`TEMPLATEID`, t1.`TEMPLPARAMS`, t1.`TOUSERS`, t1.`USERDATA`, t1.`USERDATA2` FROM `IBZMSGBODY` t1  ) t1 where msgid=#{id}]]>
     </select>
 	<select id="selectById"  resultMap="MsgBodyResultMap" databaseId="oracle">
-        <![CDATA[select t1.* from (SELECT t1.CONTENT, t1.ERRORINFO, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  ) t1 where msgid=#{id}]]>
+        <![CDATA[select t1.* from (SELECT t1.CONTENT, t1.ERRORINFO, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGLINK_PC, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA, t1.USERDATA2 FROM IBZMSGBODY t1  ) t1 where msgid=#{id}]]>
     </select>
 
     <!--通过mybatis将查询结果注入到entity中,通过配置autoMapping="true"由mybatis自动处理映射关系 -->
@@ -37,7 +37,7 @@
     </sql>
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="oracle">
-		<![CDATA[ SELECT t1.CONTENT, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  
+		<![CDATA[ SELECT t1.CONTENT, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGLINK_PC, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TOUSERS, t1.USERDATA, t1.USERDATA2 FROM IBZMSGBODY t1  
 			]]>
     </sql>
     <!--数据查询[View]-->
@@ -47,7 +47,7 @@
     </sql>
     <!--数据查询[View]-->
     <sql id="View" databaseId="oracle">
-		<![CDATA[ SELECT t1.CONTENT, t1.ERRORINFO, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA FROM IBZMSGBODY t1  
+		<![CDATA[ SELECT t1.CONTENT, t1.ERRORINFO, t1.ISERROR, t1.ISSEND, t1.MSGID, t1.MSGLINK, t1.MSGLINK_PC, t1.MSGNAME, t1.MSGTYPE, t1.SUBJECT, t1.TEMPLATEID, t1.TEMPLPARAMS, t1.TOUSERS, t1.USERDATA, t1.USERDATA2 FROM IBZMSGBODY t1  
 			]]>
     </sql>
 </mapper>

ibznotify-util/src/main/java/cn/ibizlab/util/client/IBZWFFallback.java

 package cn.ibizlab.util.client;
 
 import org.springframework.stereotype.Component;
+import com.alibaba.fastjson.JSONObject;
 import java.util.*;
 
 @Component
@@ -20,4 +21,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
     public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) {
         return null;
     }
+
+    @Override
+    public JSONObject wfstart(String system, String appname, String entity, String businessKey, JSONObject instance) {
+        return null;
+    }
 }

ibznotify-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.client;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
+import com.alibaba.fastjson.JSONObject;
 import java.util.*;
 
 @FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class)
@@ -18,4 +19,9 @@ public interface IBZWFFeignClient
 
 	@RequestMapping(method = RequestMethod.POST, value = "/deploybpmn")
 	Boolean deployBpmnFile(@RequestBody List<Map<String,Object>> bpmnfiles);
+
+	@RequestMapping(method = RequestMethod.POST, value = "/{system}-app-{appname}/{entity}/{businessKey}/process-instances")
+	JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
+					   @PathVariable("entity") String entity,
+					   @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
 }

ibznotify-util/src/main/java/cn/ibizlab/util/security/AuthenticationUser.java

@@ -18,59 +18,174 @@ import com.alibaba.fastjson.JSONObject;
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class AuthenticationUser implements UserDetails
 {
-	public AuthenticationUser()
-	{
-
-	}
-
+	public AuthenticationUser(){}
+	/**
+	 * 用戶标识
+	 */
 	private String userid;
+	/**
+	 * 用户全局名
+	 */
 	private String username;
+	/**
+	 * 用户姓名
+	 */
 	private String personname;
-	private String usercode;
+	/**
+	 * 登录名
+	 */
 	private String loginname;
+	/**
+	 * 用户工号
+	 */
+	private String usercode;
+	/**
+	 * 登录密码
+	 */
 	private String password;
+	/**
+	 * 区属
+	 */
 	private String domain;
+	/**
+	 * 部门标识
+	 */
 	private String mdeptid;
+	/**
+	 * 部门编码
+	 */
 	private String mdeptcode;
+	/**
+	 * 部门名称
+	 */
 	private String mdeptname;
+	/**
+	 * 业务编码
+	 */
 	private String bcode;
+	/**
+	 * 岗位标识
+	 */
 	private String postid;
+	/**
+	 * 岗位代码
+	 */
 	private String postcode;
+	/**
+	 * 岗位名称
+	 */
 	private String postname;
+	/**
+	 * 单位标识
+	 */
 	private String orgid;
+	/**
+	 * 单位编码
+	 */
 	private String orgcode;
+	/**
+	 * 单位名称
+	 */
 	private String orgname;
+	/**
+	 * 昵称别名
+	 */
 	private String nickname;
+	/**
+	 * 邮箱
+	 */
 	private String email;
+	/**
+	 * 社交账号
+	 */
 	private String avatar;
+	/**
+	 * 电话
+	 */
 	private String phone;
-	private String reserver;
+	/**
+	 * 照片
+	 */
 	private String usericon;
+	/**
+	 * 性别
+	 */
 	private String sex;
+	/**
+	 * 出生日期
+	 */
 	private Timestamp birthday;
+	/**
+	 * 证件号码
+	 */
 	private String certcode;
+	/**
+	 * 地址
+	 */
 	private String addr;
+	/**
+	 * 主题
+	 */
 	private String theme;
+	/**
+	 * 字号
+	 */
 	private String fontsize;
+	/**
+	 * 语言
+	 */
 	private String lang;
+	/**
+	 * 备注
+	 */
 	private String memo;
+	/**
+	 * 保留字段
+	 */
+	private String reserver;
+	/**
+	 * 用户上下文参数
+	 */
 	private Map <String,Object> sessionParams;
+	/**
+	 * 用户权限资源
+	 */
 	@JsonIgnore
 	private Collection<GrantedAuthority> authorities;
-
+    /**
+    * 是否为超级管理员
+    */
     private int superuser;
+    /**
+    * 用户权限资源
+    */
     private JSONObject permissionList;
-    private String orglevel;//单位级别
-    private String deptlevel;//部门级别
+    /**
+    * 用户上下文参数
+    */
     @JsonIgnore
-    private Map<String,Object> userSessionParam;//用户自定义session值
-    private Map<String, Set<String>> orgInfo;//上下级组织信息
+    private Map<String,Object> userSessionParam;
+    /**
+    * 当前用户上下级组织信息
+    */
+    private Map<String, Set<String>> orgInfo;
+	/**
+	* 上级组织
+	*/
 	private String porg;
+	/**
+	* 下级组织
+	*/
 	private String sorg;
+	/**
+	* 上级部门
+	*/
 	private String pdept;
+	/**
+	* 下级部门
+	*/
 	private String sdept;
 
-
 	@JsonIgnore
 	@Override
 	public boolean isAccountNonExpired() {