提交 1b63333c 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 54ceca45
...@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit; ...@@ -27,6 +27,7 @@ import cn.ibizlab.util.annotation.Audit;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import cn.ibizlab.util.domain.EntityMP; import cn.ibizlab.util.domain.EntityMP;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
/** /**
* 实体[文件] * 实体[文件]
......
...@@ -87,6 +87,7 @@ ...@@ -87,6 +87,7 @@
<alibaba-seata.version>1.3.0</alibaba-seata.version> <alibaba-seata.version>1.3.0</alibaba-seata.version>
<oracle.version>11.2.0.3</oracle.version> <oracle.version>11.2.0.3</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
</properties> </properties>
...@@ -337,6 +338,12 @@ ...@@ -337,6 +338,12 @@
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>
<version>${oracle.version}</version> <version>${oracle.version}</version>
</dependency> </dependency>
<!-- PostgreSQL驱动包 -->
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.version}</version>
</dependency>
<!-- MySQL驱动包 --> <!-- MySQL驱动包 -->
<dependency> <dependency>
<groupId>mysql</groupId> <groupId>mysql</groupId>
......
package cn.ibizlab.util.client; package cn.ibizlab.util.client;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject;
import java.util.*; import java.util.*;
@Component @Component
...@@ -20,4 +21,9 @@ public class IBZWFFallback implements IBZWFFeignClient { ...@@ -20,4 +21,9 @@ public class IBZWFFallback implements IBZWFFeignClient {
public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) { public Boolean deployBpmnFile(List<Map<String, Object>> bpmnfiles) {
return null; return null;
} }
@Override
public JSONObject wfstart(String system, String appname, String entity, String businessKey, JSONObject instance) {
return null;
}
} }
...@@ -2,6 +2,7 @@ package cn.ibizlab.util.client; ...@@ -2,6 +2,7 @@ package cn.ibizlab.util.client;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
import java.util.*; import java.util.*;
@FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class) @FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class)
...@@ -18,4 +19,9 @@ public interface IBZWFFeignClient ...@@ -18,4 +19,9 @@ public interface IBZWFFeignClient
@RequestMapping(method = RequestMethod.POST, value = "/deploybpmn") @RequestMapping(method = RequestMethod.POST, value = "/deploybpmn")
Boolean deployBpmnFile(@RequestBody List<Map<String,Object>> bpmnfiles); 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);
} }
...@@ -18,59 +18,174 @@ import com.alibaba.fastjson.JSONObject; ...@@ -18,59 +18,174 @@ import com.alibaba.fastjson.JSONObject;
@JsonIgnoreProperties(ignoreUnknown = true) @JsonIgnoreProperties(ignoreUnknown = true)
public class AuthenticationUser implements UserDetails public class AuthenticationUser implements UserDetails
{ {
public AuthenticationUser() public AuthenticationUser(){}
{ /**
* 用戶标识
} */
private String userid; private String userid;
/**
* 用户全局名
*/
private String username; private String username;
/**
* 用户姓名
*/
private String personname; private String personname;
private String usercode; /**
* 登录名
*/
private String loginname; private String loginname;
/**
* 用户工号
*/
private String usercode;
/**
* 登录密码
*/
private String password; private String password;
/**
* 区属
*/
private String domain; private String domain;
/**
* 部门标识
*/
private String mdeptid; private String mdeptid;
/**
* 部门编码
*/
private String mdeptcode; private String mdeptcode;
/**
* 部门名称
*/
private String mdeptname; private String mdeptname;
/**
* 业务编码
*/
private String bcode; private String bcode;
/**
* 岗位标识
*/
private String postid; private String postid;
/**
* 岗位代码
*/
private String postcode; private String postcode;
/**
* 岗位名称
*/
private String postname; private String postname;
/**
* 单位标识
*/
private String orgid; private String orgid;
/**
* 单位编码
*/
private String orgcode; private String orgcode;
/**
* 单位名称
*/
private String orgname; private String orgname;
/**
* 昵称别名
*/
private String nickname; private String nickname;
/**
* 邮箱
*/
private String email; private String email;
/**
* 社交账号
*/
private String avatar; private String avatar;
/**
* 电话
*/
private String phone; private String phone;
private String reserver; /**
* 照片
*/
private String usericon; private String usericon;
/**
* 性别
*/
private String sex; private String sex;
/**
* 出生日期
*/
private Timestamp birthday; private Timestamp birthday;
/**
* 证件号码
*/
private String certcode; private String certcode;
/**
* 地址
*/
private String addr; private String addr;
/**
* 主题
*/
private String theme; private String theme;
/**
* 字号
*/
private String fontsize; private String fontsize;
/**
* 语言
*/
private String lang; private String lang;
/**
* 备注
*/
private String memo; private String memo;
/**
* 保留字段
*/
private String reserver;
/**
* 用户上下文参数
*/
private Map <String,Object> sessionParams; private Map <String,Object> sessionParams;
/**
* 用户权限资源
*/
@JsonIgnore @JsonIgnore
private Collection<GrantedAuthority> authorities; private Collection<GrantedAuthority> authorities;
/**
* 是否为超级管理员
*/
private int superuser; private int superuser;
/**
* 用户权限资源
*/
private JSONObject permissionList; private JSONObject permissionList;
private String orglevel;//单位级别 /**
private String deptlevel;//部门级别 * 用户上下文参数
*/
@JsonIgnore @JsonIgnore
private Map<String,Object> userSessionParam;//用户自定义session值 private Map<String,Object> userSessionParam;
private Map<String, Set<String>> orgInfo;//上下级组织信息 /**
* 当前用户上下级组织信息
*/
private Map<String, Set<String>> orgInfo;
/**
* 上级组织
*/
private String porg; private String porg;
/**
* 下级组织
*/
private String sorg; private String sorg;
/**
* 上级部门
*/
private String pdept; private String pdept;
/**
* 下级部门
*/
private String sdept; private String sdept;
@JsonIgnore @JsonIgnore
@Override @Override
public boolean isAccountNonExpired() { public boolean isAccountNonExpired() {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册