提交 450be376 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码 [ibz-ou,统一组织单位]

上级 8af836e9
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZDEPT", resultMap = "SysDepartmentResultMap") @TableName(value = "IBZDEPT", resultMap = "SysDepartmentResultMap")
@ApiModel("部门")
public class SysDepartment extends EntityMP implements Serializable { public class SysDepartment extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableId(value = "deptid", type = IdType.ASSIGN_UUID) @TableId(value = "deptid", type = IdType.ASSIGN_UUID)
@JSONField(name = "deptid") @JSONField(name = "deptid")
@JsonProperty("deptid") @JsonProperty("deptid")
@ApiModelProperty("部门标识")
private String deptid; private String deptid;
/** /**
* 部门代码 * 部门代码
...@@ -57,6 +61,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "deptcode") @TableField(value = "deptcode")
@JSONField(name = "deptcode") @JSONField(name = "deptcode")
@JsonProperty("deptcode") @JsonProperty("deptcode")
@ApiModelProperty("部门代码")
private String deptcode; private String deptcode;
/** /**
* 部门名称 * 部门名称
...@@ -64,6 +69,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "deptname") @TableField(value = "deptname")
@JSONField(name = "deptname") @JSONField(name = "deptname")
@JsonProperty("deptname") @JsonProperty("deptname")
@ApiModelProperty("部门名称")
private String deptname; private String deptname;
/** /**
* 单位 * 单位
...@@ -72,6 +78,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -72,6 +78,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "orgid") @TableField(value = "orgid")
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@ApiModelProperty("单位")
private String orgid; private String orgid;
/** /**
* 上级部门 * 上级部门
...@@ -80,6 +87,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -80,6 +87,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "pdeptid") @TableField(value = "pdeptid")
@JSONField(name = "parentdeptid") @JSONField(name = "parentdeptid")
@JsonProperty("parentdeptid") @JsonProperty("parentdeptid")
@ApiModelProperty("上级部门")
private String parentdeptid; private String parentdeptid;
/** /**
* 部门简称 * 部门简称
...@@ -87,6 +95,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -87,6 +95,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "shortname") @TableField(value = "shortname")
@JSONField(name = "shortname") @JSONField(name = "shortname")
@JsonProperty("shortname") @JsonProperty("shortname")
@ApiModelProperty("部门简称")
private String shortname; private String shortname;
/** /**
* 部门级别 * 部门级别
...@@ -94,6 +103,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -94,6 +103,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "deptlevel") @TableField(value = "deptlevel")
@JSONField(name = "deptlevel") @JSONField(name = "deptlevel")
@JsonProperty("deptlevel") @JsonProperty("deptlevel")
@ApiModelProperty("部门级别")
private Integer deptlevel; private Integer deptlevel;
/** /**
* 区属 * 区属
...@@ -101,6 +111,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -101,6 +111,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
* 排序 * 排序
...@@ -108,6 +119,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -108,6 +119,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "showorder") @TableField(value = "showorder")
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
* 业务编码 * 业务编码
...@@ -115,6 +127,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -115,6 +127,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "bcode") @TableField(value = "bcode")
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@ApiModelProperty("业务编码")
private String bcode; private String bcode;
/** /**
* 分管领导标识 * 分管领导标识
...@@ -122,6 +135,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -122,6 +135,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "leaderid") @TableField(value = "leaderid")
@JSONField(name = "leaderid") @JSONField(name = "leaderid")
@JsonProperty("leaderid") @JsonProperty("leaderid")
@ApiModelProperty("分管领导标识")
private String leaderid; private String leaderid;
/** /**
* 分管领导 * 分管领导
...@@ -129,6 +143,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -129,6 +143,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "leadername") @TableField(value = "leadername")
@JSONField(name = "leadername") @JSONField(name = "leadername")
@JsonProperty("leadername") @JsonProperty("leadername")
@ApiModelProperty("分管领导")
private String leadername; private String leadername;
/** /**
* 逻辑有效 * 逻辑有效
...@@ -138,6 +153,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -138,6 +153,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "enable") @TableField(value = "enable")
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
* 单位 * 单位
...@@ -145,6 +161,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -145,6 +161,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@ApiModelProperty("单位")
private String orgname; private String orgname;
/** /**
* 上级部门 * 上级部门
...@@ -152,6 +169,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -152,6 +169,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "parentdeptname") @JSONField(name = "parentdeptname")
@JsonProperty("parentdeptname") @JsonProperty("parentdeptname")
@ApiModelProperty("上级部门")
private String parentdeptname; private String parentdeptname;
/** /**
* 创建时间 * 创建时间
...@@ -161,6 +179,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -161,6 +179,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
* 最后修改时间 * 最后修改时间
...@@ -170,6 +189,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -170,6 +189,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 启用标志 * 启用标志
...@@ -178,6 +198,7 @@ public class SysDepartment extends EntityMP implements Serializable { ...@@ -178,6 +198,7 @@ public class SysDepartment extends EntityMP implements Serializable {
@TableField(value = "isvalid") @TableField(value = "isvalid")
@JSONField(name = "isvalid") @JSONField(name = "isvalid")
@JsonProperty("isvalid") @JsonProperty("isvalid")
@ApiModelProperty("启用标志")
private Integer isvalid; private Integer isvalid;
/** /**
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZDEPTMEMBER", resultMap = "SysDeptMemberResultMap") @TableName(value = "IBZDEPTMEMBER", resultMap = "SysDeptMemberResultMap")
@ApiModel("部门成员")
public class SysDeptMember extends EntityMP implements Serializable { public class SysDeptMember extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableId(value = "memberid", type = IdType.ASSIGN_UUID) @TableId(value = "memberid", type = IdType.ASSIGN_UUID)
@JSONField(name = "memberid") @JSONField(name = "memberid")
@JsonProperty("memberid") @JsonProperty("memberid")
@ApiModelProperty("标识")
private String memberid; private String memberid;
/** /**
* 部门标识 * 部门标识
...@@ -57,6 +61,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(value = "deptid") @TableField(value = "deptid")
@JSONField(name = "deptid") @JSONField(name = "deptid")
@JsonProperty("deptid") @JsonProperty("deptid")
@ApiModelProperty("部门标识")
private String deptid; private String deptid;
/** /**
* 部门名称 * 部门名称
...@@ -64,6 +69,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "deptname") @JSONField(name = "deptname")
@JsonProperty("deptname") @JsonProperty("deptname")
@ApiModelProperty("部门名称")
private String deptname; private String deptname;
/** /**
* 用户标识 * 用户标识
...@@ -71,6 +77,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -71,6 +77,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(value = "userid") @TableField(value = "userid")
@JSONField(name = "userid") @JSONField(name = "userid")
@JsonProperty("userid") @JsonProperty("userid")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
* 成员 * 成员
...@@ -78,6 +85,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -78,6 +85,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "personname") @JSONField(name = "personname")
@JsonProperty("personname") @JsonProperty("personname")
@ApiModelProperty("成员")
private String personname; private String personname;
/** /**
* 岗位标识 * 岗位标识
...@@ -85,6 +93,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -85,6 +93,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(value = "postid") @TableField(value = "postid")
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
* 岗位名称 * 岗位名称
...@@ -92,6 +101,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -92,6 +101,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
* 业务条线 * 业务条线
...@@ -99,6 +109,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -99,6 +109,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@ApiModelProperty("业务条线")
private String bcode; private String bcode;
/** /**
* 区属 * 区属
...@@ -106,6 +117,7 @@ public class SysDeptMember extends EntityMP implements Serializable { ...@@ -106,6 +117,7 @@ public class SysDeptMember extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZEMP", resultMap = "SysEmployeeResultMap") @TableName(value = "IBZEMP", resultMap = "SysEmployeeResultMap")
@ApiModel("人员")
public class SysEmployee extends EntityMP implements Serializable { public class SysEmployee extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableId(value = "userid", type = IdType.ASSIGN_UUID) @TableId(value = "userid", type = IdType.ASSIGN_UUID)
@JSONField(name = "userid") @JSONField(name = "userid")
@JsonProperty("userid") @JsonProperty("userid")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
* 用户全局名 * 用户全局名
...@@ -57,6 +61,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "username") @TableField(value = "username")
@JSONField(name = "username") @JSONField(name = "username")
@JsonProperty("username") @JsonProperty("username")
@ApiModelProperty("用户全局名")
private String username; private String username;
/** /**
* 姓名 * 姓名
...@@ -64,6 +69,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "personname") @TableField(value = "personname")
@JSONField(name = "personname") @JSONField(name = "personname")
@JsonProperty("personname") @JsonProperty("personname")
@ApiModelProperty("姓名")
private String personname; private String personname;
/** /**
* 用户工号 * 用户工号
...@@ -71,6 +77,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -71,6 +77,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "usercode") @TableField(value = "usercode")
@JSONField(name = "usercode") @JSONField(name = "usercode")
@JsonProperty("usercode") @JsonProperty("usercode")
@ApiModelProperty("用户工号")
private String usercode; private String usercode;
/** /**
* 登录名 * 登录名
...@@ -78,6 +85,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -78,6 +85,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "loginname") @TableField(value = "loginname")
@JSONField(name = "loginname") @JSONField(name = "loginname")
@JsonProperty("loginname") @JsonProperty("loginname")
@ApiModelProperty("登录名")
private String loginname; private String loginname;
/** /**
* 密码 * 密码
...@@ -85,6 +93,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -85,6 +93,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "password") @TableField(value = "password")
@JSONField(name = "password") @JSONField(name = "password")
@JsonProperty("password") @JsonProperty("password")
@ApiModelProperty("密码")
private String password; private String password;
/** /**
* 区属 * 区属
...@@ -92,6 +101,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -92,6 +101,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
* 主部门 * 主部门
...@@ -99,6 +109,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -99,6 +109,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "mdeptid") @TableField(value = "mdeptid")
@JSONField(name = "mdeptid") @JSONField(name = "mdeptid")
@JsonProperty("mdeptid") @JsonProperty("mdeptid")
@ApiModelProperty("主部门")
private String mdeptid; private String mdeptid;
/** /**
* 主部门代码 * 主部门代码
...@@ -106,6 +117,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -106,6 +117,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "mdeptcode") @TableField(value = "mdeptcode")
@JSONField(name = "mdeptcode") @JSONField(name = "mdeptcode")
@JsonProperty("mdeptcode") @JsonProperty("mdeptcode")
@ApiModelProperty("主部门代码")
private String mdeptcode; private String mdeptcode;
/** /**
* 主部门名称 * 主部门名称
...@@ -113,6 +125,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -113,6 +125,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "mdeptname") @TableField(value = "mdeptname")
@JSONField(name = "mdeptname") @JSONField(name = "mdeptname")
@JsonProperty("mdeptname") @JsonProperty("mdeptname")
@ApiModelProperty("主部门名称")
private String mdeptname; private String mdeptname;
/** /**
* 业务编码 * 业务编码
...@@ -120,6 +133,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -120,6 +133,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "bcode") @TableField(value = "bcode")
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@ApiModelProperty("业务编码")
private String bcode; private String bcode;
/** /**
* 岗位标识 * 岗位标识
...@@ -127,6 +141,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -127,6 +141,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "postid") @TableField(value = "postid")
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
* 岗位代码 * 岗位代码
...@@ -134,6 +149,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -134,6 +149,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "postcode") @TableField(value = "postcode")
@JSONField(name = "postcode") @JSONField(name = "postcode")
@JsonProperty("postcode") @JsonProperty("postcode")
@ApiModelProperty("岗位代码")
private String postcode; private String postcode;
/** /**
* 岗位名称 * 岗位名称
...@@ -141,6 +157,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -141,6 +157,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "postname") @TableField(value = "postname")
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
* 单位 * 单位
...@@ -149,6 +166,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -149,6 +166,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "orgid") @TableField(value = "orgid")
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@ApiModelProperty("单位")
private String orgid; private String orgid;
/** /**
* 单位代码 * 单位代码
...@@ -156,6 +174,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -156,6 +174,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "orgcode") @TableField(value = "orgcode")
@JSONField(name = "orgcode") @JSONField(name = "orgcode")
@JsonProperty("orgcode") @JsonProperty("orgcode")
@ApiModelProperty("单位代码")
private String orgcode; private String orgcode;
/** /**
* 单位名称 * 单位名称
...@@ -164,6 +183,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -164,6 +183,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "orgname") @TableField(value = "orgname")
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@ApiModelProperty("单位名称")
private String orgname; private String orgname;
/** /**
* 昵称别名 * 昵称别名
...@@ -171,6 +191,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -171,6 +191,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "nickname") @TableField(value = "nickname")
@JSONField(name = "nickname") @JSONField(name = "nickname")
@JsonProperty("nickname") @JsonProperty("nickname")
@ApiModelProperty("昵称别名")
private String nickname; private String nickname;
/** /**
* 性别 * 性别
...@@ -178,6 +199,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -178,6 +199,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "sex") @TableField(value = "sex")
@JSONField(name = "sex") @JSONField(name = "sex")
@JsonProperty("sex") @JsonProperty("sex")
@ApiModelProperty("性别")
private String sex; private String sex;
/** /**
* 证件号码 * 证件号码
...@@ -185,6 +207,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -185,6 +207,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "certcode") @TableField(value = "certcode")
@JSONField(name = "certcode") @JSONField(name = "certcode")
@JsonProperty("certcode") @JsonProperty("certcode")
@ApiModelProperty("证件号码")
private String certcode; private String certcode;
/** /**
* 联系方式 * 联系方式
...@@ -192,6 +215,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -192,6 +215,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "phone") @TableField(value = "phone")
@JSONField(name = "phone") @JSONField(name = "phone")
@JsonProperty("phone") @JsonProperty("phone")
@ApiModelProperty("联系方式")
private String phone; private String phone;
/** /**
* 出生日期 * 出生日期
...@@ -200,6 +224,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -200,6 +224,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd", locale = "zh", timezone = "GMT+8")
@JSONField(name = "birthday", format = "yyyy-MM-dd") @JSONField(name = "birthday", format = "yyyy-MM-dd")
@JsonProperty("birthday") @JsonProperty("birthday")
@ApiModelProperty("出生日期")
private Timestamp birthday; private Timestamp birthday;
/** /**
* 邮件 * 邮件
...@@ -207,6 +232,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -207,6 +232,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "email") @TableField(value = "email")
@JSONField(name = "email") @JSONField(name = "email")
@JsonProperty("email") @JsonProperty("email")
@ApiModelProperty("邮件")
private String email; private String email;
/** /**
* 社交账号 * 社交账号
...@@ -214,6 +240,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -214,6 +240,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "avatar") @TableField(value = "avatar")
@JSONField(name = "avatar") @JSONField(name = "avatar")
@JsonProperty("avatar") @JsonProperty("avatar")
@ApiModelProperty("社交账号")
private String avatar; private String avatar;
/** /**
* 地址 * 地址
...@@ -221,6 +248,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -221,6 +248,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "addr") @TableField(value = "addr")
@JSONField(name = "addr") @JSONField(name = "addr")
@JsonProperty("addr") @JsonProperty("addr")
@ApiModelProperty("地址")
private String addr; private String addr;
/** /**
* 照片 * 照片
...@@ -228,6 +256,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -228,6 +256,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "usericon") @TableField(value = "usericon")
@JSONField(name = "usericon") @JSONField(name = "usericon")
@JsonProperty("usericon") @JsonProperty("usericon")
@ApiModelProperty("照片")
private String usericon; private String usericon;
/** /**
* ip地址 * ip地址
...@@ -235,6 +264,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -235,6 +264,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "ipaddr") @TableField(value = "ipaddr")
@JSONField(name = "ipaddr") @JSONField(name = "ipaddr")
@JsonProperty("ipaddr") @JsonProperty("ipaddr")
@ApiModelProperty("ip地址")
private String ipaddr; private String ipaddr;
/** /**
* 样式 * 样式
...@@ -242,6 +272,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -242,6 +272,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "theme") @TableField(value = "theme")
@JSONField(name = "theme") @JSONField(name = "theme")
@JsonProperty("theme") @JsonProperty("theme")
@ApiModelProperty("样式")
private String theme; private String theme;
/** /**
* 语言 * 语言
...@@ -249,6 +280,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -249,6 +280,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "lang") @TableField(value = "lang")
@JSONField(name = "lang") @JSONField(name = "lang")
@JsonProperty("lang") @JsonProperty("lang")
@ApiModelProperty("语言")
private String lang; private String lang;
/** /**
* 字号 * 字号
...@@ -256,6 +288,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -256,6 +288,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "fontsize") @TableField(value = "fontsize")
@JSONField(name = "fontsize") @JSONField(name = "fontsize")
@JsonProperty("fontsize") @JsonProperty("fontsize")
@ApiModelProperty("字号")
private String fontsize; private String fontsize;
/** /**
* 备注 * 备注
...@@ -263,6 +296,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -263,6 +296,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "memo") @TableField(value = "memo")
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@ApiModelProperty("备注")
private String memo; private String memo;
/** /**
* 保留 * 保留
...@@ -270,6 +304,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -270,6 +304,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "reserver") @TableField(value = "reserver")
@JSONField(name = "reserver") @JSONField(name = "reserver")
@JsonProperty("reserver") @JsonProperty("reserver")
@ApiModelProperty("保留")
private String reserver; private String reserver;
/** /**
* 排序 * 排序
...@@ -277,6 +312,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -277,6 +312,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "showorder") @TableField(value = "showorder")
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
* 逻辑有效 * 逻辑有效
...@@ -286,6 +322,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -286,6 +322,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@TableField(value = "enable") @TableField(value = "enable")
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
* 创建时间 * 创建时间
...@@ -295,6 +332,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -295,6 +332,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
* 最后修改时间 * 最后修改时间
...@@ -304,6 +342,7 @@ public class SysEmployee extends EntityMP implements Serializable { ...@@ -304,6 +342,7 @@ public class SysEmployee extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZORG", resultMap = "SysOrganizationResultMap") @TableName(value = "IBZORG", resultMap = "SysOrganizationResultMap")
@ApiModel("单位机构")
public class SysOrganization extends EntityMP implements Serializable { public class SysOrganization extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableId(value = "orgid", type = IdType.ASSIGN_UUID) @TableId(value = "orgid", type = IdType.ASSIGN_UUID)
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@ApiModelProperty("单位标识")
private String orgid; private String orgid;
/** /**
* 单位代码 * 单位代码
...@@ -57,6 +61,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "orgcode") @TableField(value = "orgcode")
@JSONField(name = "orgcode") @JSONField(name = "orgcode")
@JsonProperty("orgcode") @JsonProperty("orgcode")
@ApiModelProperty("单位代码")
private String orgcode; private String orgcode;
/** /**
* 名称 * 名称
...@@ -65,6 +70,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -65,6 +70,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "orgname") @TableField(value = "orgname")
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@ApiModelProperty("名称")
private String orgname; private String orgname;
/** /**
* 上级单位 * 上级单位
...@@ -73,6 +79,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -73,6 +79,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "porgid") @TableField(value = "porgid")
@JSONField(name = "parentorgid") @JSONField(name = "parentorgid")
@JsonProperty("parentorgid") @JsonProperty("parentorgid")
@ApiModelProperty("上级单位")
private String parentorgid; private String parentorgid;
/** /**
* 单位简称 * 单位简称
...@@ -80,6 +87,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -80,6 +87,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "shortname") @TableField(value = "shortname")
@JSONField(name = "shortname") @JSONField(name = "shortname")
@JsonProperty("shortname") @JsonProperty("shortname")
@ApiModelProperty("单位简称")
private String shortname; private String shortname;
/** /**
* 单位级别 * 单位级别
...@@ -87,6 +95,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -87,6 +95,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "orglevel") @TableField(value = "orglevel")
@JSONField(name = "orglevel") @JSONField(name = "orglevel")
@JsonProperty("orglevel") @JsonProperty("orglevel")
@ApiModelProperty("单位级别")
private Integer orglevel; private Integer orglevel;
/** /**
* 排序 * 排序
...@@ -94,6 +103,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -94,6 +103,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "showorder") @TableField(value = "showorder")
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
* 上级单位 * 上级单位
...@@ -101,6 +111,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -101,6 +111,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "parentorgname") @JSONField(name = "parentorgname")
@JsonProperty("parentorgname") @JsonProperty("parentorgname")
@ApiModelProperty("上级单位")
private String parentorgname; private String parentorgname;
/** /**
* 区属 * 区属
...@@ -108,6 +119,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -108,6 +119,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
* 逻辑有效 * 逻辑有效
...@@ -117,6 +129,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -117,6 +129,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "enable") @TableField(value = "enable")
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
* 创建时间 * 创建时间
...@@ -126,6 +139,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -126,6 +139,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
* 最后修改时间 * 最后修改时间
...@@ -135,6 +149,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -135,6 +149,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", locale = "zh", timezone = "GMT+8")
@JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate", format = "yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 启用标志 * 启用标志
...@@ -143,6 +158,7 @@ public class SysOrganization extends EntityMP implements Serializable { ...@@ -143,6 +158,7 @@ public class SysOrganization extends EntityMP implements Serializable {
@TableField(value = "isvalid") @TableField(value = "isvalid")
@JSONField(name = "isvalid") @JSONField(name = "isvalid")
@JsonProperty("isvalid") @JsonProperty("isvalid")
@ApiModelProperty("启用标志")
private Integer isvalid; private Integer isvalid;
/** /**
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZPOST", resultMap = "SysPostResultMap") @TableName(value = "IBZPOST", resultMap = "SysPostResultMap")
@ApiModel("岗位")
public class SysPost extends EntityMP implements Serializable { public class SysPost extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysPost extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysPost extends EntityMP implements Serializable {
@TableId(value = "postid", type = IdType.ASSIGN_UUID) @TableId(value = "postid", type = IdType.ASSIGN_UUID)
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
* 岗位编码 * 岗位编码
...@@ -57,6 +61,7 @@ public class SysPost extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysPost extends EntityMP implements Serializable {
@TableField(value = "postcode") @TableField(value = "postcode")
@JSONField(name = "postcode") @JSONField(name = "postcode")
@JsonProperty("postcode") @JsonProperty("postcode")
@ApiModelProperty("岗位编码")
private String postcode; private String postcode;
/** /**
* 岗位名称 * 岗位名称
...@@ -64,6 +69,7 @@ public class SysPost extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysPost extends EntityMP implements Serializable {
@TableField(value = "postname") @TableField(value = "postname")
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
* 区属 * 区属
...@@ -71,6 +77,7 @@ public class SysPost extends EntityMP implements Serializable { ...@@ -71,6 +77,7 @@ public class SysPost extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
* 备注 * 备注
...@@ -78,6 +85,7 @@ public class SysPost extends EntityMP implements Serializable { ...@@ -78,6 +85,7 @@ public class SysPost extends EntityMP implements Serializable {
@TableField(value = "memo") @TableField(value = "memo")
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@ApiModelProperty("备注")
private String memo; private String memo;
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZTEAM", resultMap = "SysTeamResultMap") @TableName(value = "IBZTEAM", resultMap = "SysTeamResultMap")
@ApiModel("组")
public class SysTeam extends EntityMP implements Serializable { public class SysTeam extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysTeam extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysTeam extends EntityMP implements Serializable {
@TableId(value = "teamid", type = IdType.ASSIGN_UUID) @TableId(value = "teamid", type = IdType.ASSIGN_UUID)
@JSONField(name = "teamid") @JSONField(name = "teamid")
@JsonProperty("teamid") @JsonProperty("teamid")
@ApiModelProperty("组标识")
private String teamid; private String teamid;
/** /**
* 组名称 * 组名称
...@@ -57,6 +61,7 @@ public class SysTeam extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysTeam extends EntityMP implements Serializable {
@TableField(value = "teamname") @TableField(value = "teamname")
@JSONField(name = "teamname") @JSONField(name = "teamname")
@JsonProperty("teamname") @JsonProperty("teamname")
@ApiModelProperty("组名称")
private String teamname; private String teamname;
/** /**
* 备注 * 备注
...@@ -64,6 +69,7 @@ public class SysTeam extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysTeam extends EntityMP implements Serializable {
@TableField(value = "memo") @TableField(value = "memo")
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@ApiModelProperty("备注")
private String memo; private String memo;
/** /**
* 区属 * 区属
...@@ -71,6 +77,7 @@ public class SysTeam extends EntityMP implements Serializable { ...@@ -71,6 +77,7 @@ public class SysTeam extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
......
...@@ -24,6 +24,8 @@ import java.io.Serializable; ...@@ -24,6 +24,8 @@ import java.io.Serializable;
import lombok.*; import lombok.*;
import org.springframework.data.annotation.Transient; import org.springframework.data.annotation.Transient;
import cn.ibizlab.util.annotation.Audit; import cn.ibizlab.util.annotation.Audit;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; ...@@ -39,6 +41,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
@NoArgsConstructor @NoArgsConstructor
@JsonIgnoreProperties(value = "handler") @JsonIgnoreProperties(value = "handler")
@TableName(value = "IBZTEAMMEMBER", resultMap = "SysTeamMemberResultMap") @TableName(value = "IBZTEAMMEMBER", resultMap = "SysTeamMemberResultMap")
@ApiModel("组成员")
public class SysTeamMember extends EntityMP implements Serializable { public class SysTeamMember extends EntityMP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -50,6 +53,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -50,6 +53,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableId(value = "teammemberid", type = IdType.ASSIGN_UUID) @TableId(value = "teammemberid", type = IdType.ASSIGN_UUID)
@JSONField(name = "teammemberid") @JSONField(name = "teammemberid")
@JsonProperty("teammemberid") @JsonProperty("teammemberid")
@ApiModelProperty("组成员标识")
private String teammemberid; private String teammemberid;
/** /**
* 组标识 * 组标识
...@@ -57,6 +61,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -57,6 +61,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(value = "teamid") @TableField(value = "teamid")
@JSONField(name = "teamid") @JSONField(name = "teamid")
@JsonProperty("teamid") @JsonProperty("teamid")
@ApiModelProperty("组标识")
private String teamid; private String teamid;
/** /**
* 组名称 * 组名称
...@@ -64,6 +69,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -64,6 +69,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "teamname") @JSONField(name = "teamname")
@JsonProperty("teamname") @JsonProperty("teamname")
@ApiModelProperty("组名称")
private String teamname; private String teamname;
/** /**
* 用户标识 * 用户标识
...@@ -71,6 +77,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -71,6 +77,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(value = "userid") @TableField(value = "userid")
@JSONField(name = "userid") @JSONField(name = "userid")
@JsonProperty("userid") @JsonProperty("userid")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
* 姓名 * 姓名
...@@ -78,6 +85,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -78,6 +85,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "personname") @JSONField(name = "personname")
@JsonProperty("personname") @JsonProperty("personname")
@ApiModelProperty("姓名")
private String personname; private String personname;
/** /**
* 岗位标识 * 岗位标识
...@@ -85,6 +93,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -85,6 +93,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(value = "postid") @TableField(value = "postid")
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
* 岗位 * 岗位
...@@ -92,6 +101,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -92,6 +101,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@ApiModelProperty("岗位")
private String postname; private String postname;
/** /**
* 区属 * 区属
...@@ -99,6 +109,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -99,6 +109,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(value = "domains") @TableField(value = "domains")
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
* 登录名 * 登录名
...@@ -106,6 +117,7 @@ public class SysTeamMember extends EntityMP implements Serializable { ...@@ -106,6 +117,7 @@ public class SysTeamMember extends EntityMP implements Serializable {
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "username") @JSONField(name = "username")
@JsonProperty("username") @JsonProperty("username")
@ApiModelProperty("登录名")
private String username; private String username;
/** /**
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysDepartmentDTO] * 服务DTO对象[SysDepartmentDTO]
*/ */
@Data @Data
@ApiModel("部门")
public class SysDepartmentDTO extends DTOBase implements Serializable { public class SysDepartmentDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "deptid") @JSONField(name = "deptid")
@JsonProperty("deptid") @JsonProperty("deptid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门标识")
private String deptid; private String deptid;
/** /**
...@@ -46,6 +50,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -46,6 +50,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonProperty("deptcode") @JsonProperty("deptcode")
@NotBlank(message = "[部门代码]不允许为空!") @NotBlank(message = "[部门代码]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门代码")
private String deptcode; private String deptcode;
/** /**
...@@ -56,6 +61,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -56,6 +61,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonProperty("deptname") @JsonProperty("deptname")
@NotBlank(message = "[部门名称]不允许为空!") @NotBlank(message = "[部门名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门名称")
private String deptname; private String deptname;
/** /**
...@@ -65,6 +71,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -65,6 +71,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位")
private String orgid; private String orgid;
/** /**
...@@ -74,6 +81,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -74,6 +81,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "parentdeptid") @JSONField(name = "parentdeptid")
@JsonProperty("parentdeptid") @JsonProperty("parentdeptid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("上级部门")
private String parentdeptid; private String parentdeptid;
/** /**
...@@ -83,6 +91,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -83,6 +91,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "shortname") @JSONField(name = "shortname")
@JsonProperty("shortname") @JsonProperty("shortname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门简称")
private String shortname; private String shortname;
/** /**
...@@ -91,6 +100,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -91,6 +100,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "deptlevel") @JSONField(name = "deptlevel")
@JsonProperty("deptlevel") @JsonProperty("deptlevel")
@ApiModelProperty("部门级别")
private Integer deptlevel; private Integer deptlevel;
/** /**
...@@ -100,6 +110,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -100,6 +110,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
...@@ -108,6 +119,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -108,6 +119,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
...@@ -117,6 +129,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -117,6 +129,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("业务编码")
private String bcode; private String bcode;
/** /**
...@@ -126,6 +139,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -126,6 +139,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "leaderid") @JSONField(name = "leaderid")
@JsonProperty("leaderid") @JsonProperty("leaderid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("分管领导标识")
private String leaderid; private String leaderid;
/** /**
...@@ -135,6 +149,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -135,6 +149,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "leadername") @JSONField(name = "leadername")
@JsonProperty("leadername") @JsonProperty("leadername")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("分管领导")
private String leadername; private String leadername;
/** /**
...@@ -143,6 +158,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -143,6 +158,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
...@@ -152,6 +168,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -152,6 +168,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位")
private String orgname; private String orgname;
/** /**
...@@ -161,6 +178,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -161,6 +178,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JSONField(name = "parentdeptname") @JSONField(name = "parentdeptname")
@JsonProperty("parentdeptname") @JsonProperty("parentdeptname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("上级部门")
private String parentdeptname; private String parentdeptname;
/** /**
...@@ -170,6 +188,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -170,6 +188,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
...@@ -179,6 +198,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -179,6 +198,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
...@@ -187,6 +207,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable { ...@@ -187,6 +207,7 @@ public class SysDepartmentDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "isvalid") @JSONField(name = "isvalid")
@JsonProperty("isvalid") @JsonProperty("isvalid")
@ApiModelProperty("启用标志")
private Integer isvalid; private Integer isvalid;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysDeptMemberDTO] * 服务DTO对象[SysDeptMemberDTO]
*/ */
@Data @Data
@ApiModel("部门成员")
public class SysDeptMemberDTO extends DTOBase implements Serializable { public class SysDeptMemberDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "memberid") @JSONField(name = "memberid")
@JsonProperty("memberid") @JsonProperty("memberid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("标识")
private String memberid; private String memberid;
/** /**
...@@ -46,6 +50,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -46,6 +50,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JsonProperty("deptid") @JsonProperty("deptid")
@NotBlank(message = "[部门标识]不允许为空!") @NotBlank(message = "[部门标识]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门标识")
private String deptid; private String deptid;
/** /**
...@@ -55,6 +60,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -55,6 +60,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "deptname") @JSONField(name = "deptname")
@JsonProperty("deptname") @JsonProperty("deptname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("部门名称")
private String deptname; private String deptname;
/** /**
...@@ -65,6 +71,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -65,6 +71,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JsonProperty("userid") @JsonProperty("userid")
@NotBlank(message = "[用户标识]不允许为空!") @NotBlank(message = "[用户标识]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
...@@ -74,6 +81,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -74,6 +81,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "personname") @JSONField(name = "personname")
@JsonProperty("personname") @JsonProperty("personname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("成员")
private String personname; private String personname;
/** /**
...@@ -83,6 +91,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -83,6 +91,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
...@@ -92,6 +101,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -92,6 +101,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
...@@ -101,6 +111,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -101,6 +111,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("业务条线")
private String bcode; private String bcode;
/** /**
...@@ -110,6 +121,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable { ...@@ -110,6 +121,7 @@ public class SysDeptMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysEmployeeDTO] * 服务DTO对象[SysEmployeeDTO]
*/ */
@Data @Data
@ApiModel("人员")
public class SysEmployeeDTO extends DTOBase implements Serializable { public class SysEmployeeDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "userid") @JSONField(name = "userid")
@JsonProperty("userid") @JsonProperty("userid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
...@@ -45,6 +49,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -45,6 +49,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "username") @JSONField(name = "username")
@JsonProperty("username") @JsonProperty("username")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("用户全局名")
private String username; private String username;
/** /**
...@@ -55,6 +60,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -55,6 +60,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("personname") @JsonProperty("personname")
@NotBlank(message = "[姓名]不允许为空!") @NotBlank(message = "[姓名]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("姓名")
private String personname; private String personname;
/** /**
...@@ -65,6 +71,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -65,6 +71,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("usercode") @JsonProperty("usercode")
@NotBlank(message = "[用户工号]不允许为空!") @NotBlank(message = "[用户工号]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("用户工号")
private String usercode; private String usercode;
/** /**
...@@ -75,6 +82,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -75,6 +82,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("loginname") @JsonProperty("loginname")
@NotBlank(message = "[登录名]不允许为空!") @NotBlank(message = "[登录名]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("登录名")
private String loginname; private String loginname;
/** /**
...@@ -85,6 +93,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -85,6 +93,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonProperty("password") @JsonProperty("password")
@NotBlank(message = "[密码]不允许为空!") @NotBlank(message = "[密码]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("密码")
private String password; private String password;
/** /**
...@@ -94,6 +103,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -94,6 +103,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
...@@ -103,6 +113,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -103,6 +113,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "mdeptid") @JSONField(name = "mdeptid")
@JsonProperty("mdeptid") @JsonProperty("mdeptid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("主部门")
private String mdeptid; private String mdeptid;
/** /**
...@@ -112,6 +123,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -112,6 +123,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "mdeptcode") @JSONField(name = "mdeptcode")
@JsonProperty("mdeptcode") @JsonProperty("mdeptcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("主部门代码")
private String mdeptcode; private String mdeptcode;
/** /**
...@@ -121,6 +133,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -121,6 +133,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "mdeptname") @JSONField(name = "mdeptname")
@JsonProperty("mdeptname") @JsonProperty("mdeptname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("主部门名称")
private String mdeptname; private String mdeptname;
/** /**
...@@ -130,6 +143,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -130,6 +143,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "bcode") @JSONField(name = "bcode")
@JsonProperty("bcode") @JsonProperty("bcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("业务编码")
private String bcode; private String bcode;
/** /**
...@@ -139,6 +153,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -139,6 +153,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
...@@ -148,6 +163,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -148,6 +163,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "postcode") @JSONField(name = "postcode")
@JsonProperty("postcode") @JsonProperty("postcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位代码")
private String postcode; private String postcode;
/** /**
...@@ -157,6 +173,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -157,6 +173,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
...@@ -166,6 +183,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -166,6 +183,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位")
private String orgid; private String orgid;
/** /**
...@@ -175,6 +193,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -175,6 +193,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "orgcode") @JSONField(name = "orgcode")
@JsonProperty("orgcode") @JsonProperty("orgcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位代码")
private String orgcode; private String orgcode;
/** /**
...@@ -184,6 +203,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -184,6 +203,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位名称")
private String orgname; private String orgname;
/** /**
...@@ -193,6 +213,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -193,6 +213,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "nickname") @JSONField(name = "nickname")
@JsonProperty("nickname") @JsonProperty("nickname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("昵称别名")
private String nickname; private String nickname;
/** /**
...@@ -202,6 +223,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -202,6 +223,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "sex") @JSONField(name = "sex")
@JsonProperty("sex") @JsonProperty("sex")
@Size(min = 0, max = 20, message = "内容长度必须小于等于[20]") @Size(min = 0, max = 20, message = "内容长度必须小于等于[20]")
@ApiModelProperty("性别")
private String sex; private String sex;
/** /**
...@@ -211,6 +233,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -211,6 +233,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "certcode") @JSONField(name = "certcode")
@JsonProperty("certcode") @JsonProperty("certcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("证件号码")
private String certcode; private String certcode;
/** /**
...@@ -220,6 +243,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -220,6 +243,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "phone") @JSONField(name = "phone")
@JsonProperty("phone") @JsonProperty("phone")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("联系方式")
private String phone; private String phone;
/** /**
...@@ -229,6 +253,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -229,6 +253,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd", locale = "zh" , timezone="GMT+8")
@JSONField(name = "birthday" , format="yyyy-MM-dd") @JSONField(name = "birthday" , format="yyyy-MM-dd")
@JsonProperty("birthday") @JsonProperty("birthday")
@ApiModelProperty("出生日期")
private Timestamp birthday; private Timestamp birthday;
/** /**
...@@ -238,6 +263,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -238,6 +263,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "email") @JSONField(name = "email")
@JsonProperty("email") @JsonProperty("email")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("邮件")
private String email; private String email;
/** /**
...@@ -247,6 +273,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -247,6 +273,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "avatar") @JSONField(name = "avatar")
@JsonProperty("avatar") @JsonProperty("avatar")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("社交账号")
private String avatar; private String avatar;
/** /**
...@@ -256,6 +283,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -256,6 +283,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "addr") @JSONField(name = "addr")
@JsonProperty("addr") @JsonProperty("addr")
@Size(min = 0, max = 255, message = "内容长度必须小于等于[255]") @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
@ApiModelProperty("地址")
private String addr; private String addr;
/** /**
...@@ -265,6 +293,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -265,6 +293,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "usericon") @JSONField(name = "usericon")
@JsonProperty("usericon") @JsonProperty("usericon")
@Size(min = 0, max = 255, message = "内容长度必须小于等于[255]") @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
@ApiModelProperty("照片")
private String usericon; private String usericon;
/** /**
...@@ -274,6 +303,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -274,6 +303,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "ipaddr") @JSONField(name = "ipaddr")
@JsonProperty("ipaddr") @JsonProperty("ipaddr")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("ip地址")
private String ipaddr; private String ipaddr;
/** /**
...@@ -283,6 +313,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -283,6 +313,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "theme") @JSONField(name = "theme")
@JsonProperty("theme") @JsonProperty("theme")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("样式")
private String theme; private String theme;
/** /**
...@@ -292,6 +323,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -292,6 +323,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "lang") @JSONField(name = "lang")
@JsonProperty("lang") @JsonProperty("lang")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("语言")
private String lang; private String lang;
/** /**
...@@ -301,6 +333,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -301,6 +333,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "fontsize") @JSONField(name = "fontsize")
@JsonProperty("fontsize") @JsonProperty("fontsize")
@Size(min = 0, max = 10, message = "内容长度必须小于等于[10]") @Size(min = 0, max = 10, message = "内容长度必须小于等于[10]")
@ApiModelProperty("字号")
private String fontsize; private String fontsize;
/** /**
...@@ -310,6 +343,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -310,6 +343,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@Size(min = 0, max = 255, message = "内容长度必须小于等于[255]") @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
@ApiModelProperty("备注")
private String memo; private String memo;
/** /**
...@@ -319,6 +353,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -319,6 +353,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JSONField(name = "reserver") @JSONField(name = "reserver")
@JsonProperty("reserver") @JsonProperty("reserver")
@Size(min = 0, max = 255, message = "内容长度必须小于等于[255]") @Size(min = 0, max = 255, message = "内容长度必须小于等于[255]")
@ApiModelProperty("保留")
private String reserver; private String reserver;
/** /**
...@@ -327,6 +362,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -327,6 +362,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
...@@ -335,6 +371,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -335,6 +371,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
...@@ -344,6 +381,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -344,6 +381,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
...@@ -353,6 +391,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable { ...@@ -353,6 +391,7 @@ public class SysEmployeeDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysOrganizationDTO] * 服务DTO对象[SysOrganizationDTO]
*/ */
@Data @Data
@ApiModel("单位机构")
public class SysOrganizationDTO extends DTOBase implements Serializable { public class SysOrganizationDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "orgid") @JSONField(name = "orgid")
@JsonProperty("orgid") @JsonProperty("orgid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位标识")
private String orgid; private String orgid;
/** /**
...@@ -45,6 +49,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -45,6 +49,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "orgcode") @JSONField(name = "orgcode")
@JsonProperty("orgcode") @JsonProperty("orgcode")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位代码")
private String orgcode; private String orgcode;
/** /**
...@@ -54,6 +59,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -54,6 +59,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "orgname") @JSONField(name = "orgname")
@JsonProperty("orgname") @JsonProperty("orgname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("名称")
private String orgname; private String orgname;
/** /**
...@@ -63,6 +69,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -63,6 +69,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "parentorgid") @JSONField(name = "parentorgid")
@JsonProperty("parentorgid") @JsonProperty("parentorgid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("上级单位")
private String parentorgid; private String parentorgid;
/** /**
...@@ -72,6 +79,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -72,6 +79,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "shortname") @JSONField(name = "shortname")
@JsonProperty("shortname") @JsonProperty("shortname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("单位简称")
private String shortname; private String shortname;
/** /**
...@@ -80,6 +88,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -80,6 +88,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "orglevel") @JSONField(name = "orglevel")
@JsonProperty("orglevel") @JsonProperty("orglevel")
@ApiModelProperty("单位级别")
private Integer orglevel; private Integer orglevel;
/** /**
...@@ -88,6 +97,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -88,6 +97,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "showorder") @JSONField(name = "showorder")
@JsonProperty("showorder") @JsonProperty("showorder")
@ApiModelProperty("排序")
private Integer showorder; private Integer showorder;
/** /**
...@@ -97,6 +107,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -97,6 +107,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "parentorgname") @JSONField(name = "parentorgname")
@JsonProperty("parentorgname") @JsonProperty("parentorgname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("上级单位")
private String parentorgname; private String parentorgname;
/** /**
...@@ -106,6 +117,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -106,6 +117,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
...@@ -114,6 +126,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -114,6 +126,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "enable") @JSONField(name = "enable")
@JsonProperty("enable") @JsonProperty("enable")
@ApiModelProperty("逻辑有效")
private Integer enable; private Integer enable;
/** /**
...@@ -123,6 +136,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -123,6 +136,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "createdate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("createdate") @JsonProperty("createdate")
@ApiModelProperty("创建时间")
private Timestamp createdate; private Timestamp createdate;
/** /**
...@@ -132,6 +146,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -132,6 +146,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
@JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss", locale = "zh" , timezone="GMT+8")
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss") @JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate") @JsonProperty("updatedate")
@ApiModelProperty("最后修改时间")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
...@@ -140,6 +155,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable { ...@@ -140,6 +155,7 @@ public class SysOrganizationDTO extends DTOBase implements Serializable {
*/ */
@JSONField(name = "isvalid") @JSONField(name = "isvalid")
@JsonProperty("isvalid") @JsonProperty("isvalid")
@ApiModelProperty("启用标志")
private Integer isvalid; private Integer isvalid;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysPostDTO] * 服务DTO对象[SysPostDTO]
*/ */
@Data @Data
@ApiModel("岗位")
public class SysPostDTO extends DTOBase implements Serializable { public class SysPostDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysPostDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysPostDTO extends DTOBase implements Serializable {
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
...@@ -46,6 +50,7 @@ public class SysPostDTO extends DTOBase implements Serializable { ...@@ -46,6 +50,7 @@ public class SysPostDTO extends DTOBase implements Serializable {
@JsonProperty("postcode") @JsonProperty("postcode")
@NotBlank(message = "[岗位编码]不允许为空!") @NotBlank(message = "[岗位编码]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位编码")
private String postcode; private String postcode;
/** /**
...@@ -56,6 +61,7 @@ public class SysPostDTO extends DTOBase implements Serializable { ...@@ -56,6 +61,7 @@ public class SysPostDTO extends DTOBase implements Serializable {
@JsonProperty("postname") @JsonProperty("postname")
@NotBlank(message = "[岗位名称]不允许为空!") @NotBlank(message = "[岗位名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位名称")
private String postname; private String postname;
/** /**
...@@ -65,6 +71,7 @@ public class SysPostDTO extends DTOBase implements Serializable { ...@@ -65,6 +71,7 @@ public class SysPostDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
...@@ -74,6 +81,7 @@ public class SysPostDTO extends DTOBase implements Serializable { ...@@ -74,6 +81,7 @@ public class SysPostDTO extends DTOBase implements Serializable {
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]") @Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]")
@ApiModelProperty("备注")
private String memo; private String memo;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysTeamDTO] * 服务DTO对象[SysTeamDTO]
*/ */
@Data @Data
@ApiModel("组")
public class SysTeamDTO extends DTOBase implements Serializable { public class SysTeamDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysTeamDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysTeamDTO extends DTOBase implements Serializable {
@JSONField(name = "teamid") @JSONField(name = "teamid")
@JsonProperty("teamid") @JsonProperty("teamid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("组标识")
private String teamid; private String teamid;
/** /**
...@@ -46,6 +50,7 @@ public class SysTeamDTO extends DTOBase implements Serializable { ...@@ -46,6 +50,7 @@ public class SysTeamDTO extends DTOBase implements Serializable {
@JsonProperty("teamname") @JsonProperty("teamname")
@NotBlank(message = "[组名称]不允许为空!") @NotBlank(message = "[组名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("组名称")
private String teamname; private String teamname;
/** /**
...@@ -55,6 +60,7 @@ public class SysTeamDTO extends DTOBase implements Serializable { ...@@ -55,6 +60,7 @@ public class SysTeamDTO extends DTOBase implements Serializable {
@JSONField(name = "memo") @JSONField(name = "memo")
@JsonProperty("memo") @JsonProperty("memo")
@Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]") @Size(min = 0, max = 2000, message = "内容长度必须小于等于[2000]")
@ApiModelProperty("备注")
private String memo; private String memo;
/** /**
...@@ -64,6 +70,7 @@ public class SysTeamDTO extends DTOBase implements Serializable { ...@@ -64,6 +70,7 @@ public class SysTeamDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
......
...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size; ...@@ -20,11 +20,14 @@ import javax.validation.constraints.Size;
import cn.ibizlab.util.domain.DTOBase; import cn.ibizlab.util.domain.DTOBase;
import cn.ibizlab.util.domain.DTOClient; import cn.ibizlab.util.domain.DTOClient;
import lombok.Data; import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/** /**
* 服务DTO对象[SysTeamMemberDTO] * 服务DTO对象[SysTeamMemberDTO]
*/ */
@Data @Data
@ApiModel("组成员")
public class SysTeamMemberDTO extends DTOBase implements Serializable { public class SysTeamMemberDTO extends DTOBase implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
...@@ -36,6 +39,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -36,6 +39,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "teammemberid") @JSONField(name = "teammemberid")
@JsonProperty("teammemberid") @JsonProperty("teammemberid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("组成员标识")
private String teammemberid; private String teammemberid;
/** /**
...@@ -46,6 +50,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -46,6 +50,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JsonProperty("teamid") @JsonProperty("teamid")
@NotBlank(message = "[组标识]不允许为空!") @NotBlank(message = "[组标识]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("组标识")
private String teamid; private String teamid;
/** /**
...@@ -56,6 +61,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -56,6 +61,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JsonProperty("teamname") @JsonProperty("teamname")
@NotBlank(message = "[组名称]不允许为空!") @NotBlank(message = "[组名称]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("组名称")
private String teamname; private String teamname;
/** /**
...@@ -66,6 +72,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -66,6 +72,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JsonProperty("userid") @JsonProperty("userid")
@NotBlank(message = "[用户标识]不允许为空!") @NotBlank(message = "[用户标识]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("用户标识")
private String userid; private String userid;
/** /**
...@@ -76,6 +83,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -76,6 +83,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JsonProperty("personname") @JsonProperty("personname")
@NotBlank(message = "[姓名]不允许为空!") @NotBlank(message = "[姓名]不允许为空!")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("姓名")
private String personname; private String personname;
/** /**
...@@ -85,6 +93,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -85,6 +93,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "postid") @JSONField(name = "postid")
@JsonProperty("postid") @JsonProperty("postid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位标识")
private String postid; private String postid;
/** /**
...@@ -94,6 +103,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -94,6 +103,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "postname") @JSONField(name = "postname")
@JsonProperty("postname") @JsonProperty("postname")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("岗位")
private String postname; private String postname;
/** /**
...@@ -103,6 +113,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -103,6 +113,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "domains") @JSONField(name = "domains")
@JsonProperty("domains") @JsonProperty("domains")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("区属")
private String domains; private String domains;
/** /**
...@@ -112,6 +123,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable { ...@@ -112,6 +123,7 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@JSONField(name = "username") @JSONField(name = "username")
@JsonProperty("username") @JsonProperty("username")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]") @Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
@ApiModelProperty("登录名")
private String username; private String username;
......
...@@ -27,6 +27,16 @@ import java.util.Map; ...@@ -27,6 +27,16 @@ import java.util.Map;
@Component @Component
public class DEFieldDefaultValueAspect public class DEFieldDefaultValueAspect
{ {
/**
* 操作用户标识
*/
final static String TAG_PERSONID = "SRF_PERSONID";
/**
* 操作用户名称
*/
final static String TAG_PERSONNAME = "SRF_PERSONNAME";
/** /**
* 新建数据切入点 * 新建数据切入点
* @param point * @param point
...@@ -221,16 +231,16 @@ public class DEFieldDefaultValueAspect ...@@ -221,16 +231,16 @@ public class DEFieldDefaultValueAspect
switch(preFieldType) { switch(preFieldType) {
case CREATEMAN: case CREATEMAN:
et.set(fieldname, curUser.getUserid()); et.set(fieldname, StringUtils.isEmpty(curUser.getUserid()) ? et.get(TAG_PERSONID) : curUser.getUserid());
break; break;
case CREATEMANNAME: case CREATEMANNAME:
et.set(fieldname, curUser.getPersonname()); et.set(fieldname, StringUtils.isEmpty(curUser.getPersonname()) ? et.get(TAG_PERSONNAME) : curUser.getPersonname());
break; break;
case UPDATEMAN: case UPDATEMAN:
et.set(fieldname, curUser.getUserid()); et.set(fieldname, StringUtils.isEmpty(curUser.getUserid()) ? et.get(TAG_PERSONID) : curUser.getUserid());
break; break;
case UPDATEMANNAME: case UPDATEMANNAME:
et.set(fieldname, curUser.getPersonname()); et.set(fieldname, StringUtils.isEmpty(curUser.getPersonname()) ? et.get(TAG_PERSONNAME) : curUser.getPersonname());
break; break;
case CREATEDATE: case CREATEDATE:
et.set(fieldname, new Timestamp(new Date().getTime())); et.set(fieldname, new Timestamp(new Date().getTime()));
......
package cn.ibizlab.util.aspect; package cn.ibizlab.util.aspect;
import com.alibaba.fastjson.JSON;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.util.domain.EntityBase; import cn.ibizlab.util.domain.EntityBase;
import com.alibaba.fastjson.JSON;
import org.apache.rocketmq.client.producer.DefaultMQProducer; import org.apache.rocketmq.client.producer.DefaultMQProducer;
import org.apache.rocketmq.client.producer.SendResult; import org.apache.rocketmq.client.producer.SendResult;
import org.apache.rocketmq.common.message.Message; import org.apache.rocketmq.common.message.Message;
import org.aspectj.lang.JoinPoint; import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.AfterReturning; import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.context.annotation.Lazy; import org.springframework.context.annotation.Lazy;
import org.springframework.expression.EvaluationContext; import org.springframework.expression.EvaluationContext;
import org.springframework.expression.Expression; import org.springframework.expression.Expression;
import org.springframework.expression.ExpressionParser; import org.springframework.expression.ExpressionParser;
import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardEvaluationContext;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.List;
/** /**
* rocketMQ消息切面 * rocketMQ消息切面
...@@ -42,66 +41,83 @@ public class RocketMQAspect ...@@ -42,66 +41,83 @@ public class RocketMQAspect
@Value("${rocketmq.producer.topic:default}") @Value("${rocketmq.producer.topic:default}")
private String topic; private String topic;
@AfterReturning(value = "(execution(* cn.ibizlab.core.*.service.*SysEmployee*.remove*(..)))") @Around(value = "(execution(* cn.ibizlab.core.*.service.ISysEmployeeService.remove*(..)))")
@Async public Object sysEmployeedeleteSysUser(ProceedingJoinPoint point) throws Throwable{
public void sysEmployeedeleteSysUser(JoinPoint point) { Object entity = getEntity(point);
sendMsg(topic, "deletesysuser", getEntity(point)); Object result = point.proceed();
sendMsg(topic, "deletesysuser", entity);
return result;
} }
@AfterReturning(value = "(execution(* cn.ibizlab.core.*.service.*SysEmployee*.create*(..))||execution(* cn.ibizlab.core.*.service.*SysEmployee*.update*(..)))") @Around(value = "(execution(* cn.ibizlab.core.*.service.ISysEmployeeService.create*(..))||execution(* cn.ibizlab.core.*.service.ISysEmployeeService.update*(..)))")
@Async public Object sysEmployeesaveSysUser(ProceedingJoinPoint point) throws Throwable{
public void sysEmployeesaveSysUser(JoinPoint point) { Object entity = getEntity(point);
sendMsg(topic, "savesysuser", getEntity(point)); Object result = point.proceed();
sendMsg(topic, "savesysuser", entity);
return result;
} }
/** /**
* 输出过滤行为 * 输出过滤行为
* @param point * @param point
* @param actionName * @param actionName
* @param entity
*/ */
private void outputAction(JoinPoint point,String actionName) { private void outputAction(JoinPoint point, String actionName, Object entity) {
Object [] args = point.getArgs(); Object[] args = point.getArgs();
if(ObjectUtils.isEmpty(args) || args.length==0) { if (ObjectUtils.isEmpty(args) || args.length == 0 || ObjectUtils.isEmpty(entity)) {
return; return;
} }
Object arg = args[0];
Object service = point.getTarget(); Object service = point.getTarget();
EvaluationContext serviceCtx = new StandardEvaluationContext(); EvaluationContext serviceCtx = new StandardEvaluationContext();
serviceCtx.setVariable("service", service); serviceCtx.setVariable("service", service);
serviceCtx.setVariable("arg", arg); serviceCtx.setVariable("arg", entity);
Expression serviceExp = parser.parseExpression(String.format("#service.%s(#arg)", actionName)); Expression serviceExp = parser.parseExpression(String.format("#service.%s(#arg)", actionName));
serviceExp.getValue(serviceCtx); serviceExp.getValue(serviceCtx);
} }
/** /**
* 获取实体对象 * 获取实体对象
*
* @param point * @param point
* @return * @return
*/ */
private Object getEntity(JoinPoint point) { private Object getEntity(ProceedingJoinPoint point) {
Object entity=null; Object entity = null;
String action=point.getSignature().getName(); try {
Object [] args = point.getArgs(); String action = point.getSignature().getName();
if(ObjectUtils.isEmpty(args) || args.length==0 || StringUtils.isEmpty(action)) { Object[] args = point.getArgs();
Object serviceObj = point.getTarget();
if (ObjectUtils.isEmpty(args) || args.length == 0 || StringUtils.isEmpty(action)) {
return entity; return entity;
} }
Object arg=args[0]; if ("remove".equalsIgnoreCase(action)) {
if(arg instanceof EntityBase || arg instanceof List) { Object idValue = args[0];
return arg; if (!ObjectUtils.isEmpty(serviceObj)) {
EvaluationContext oldContext = new StandardEvaluationContext();
oldContext.setVariable("service", serviceObj);
oldContext.setVariable("id", idValue);
Expression oldExp = parser.parseExpression("#service.get(#id)");
entity = oldExp.getValue(oldContext, EntityBase.class);
}
} else {
entity = args[0];
} }
else { } catch (Exception e) {
return null; log.error("发送消息失败,无法获取实体对象" + e);
} }
return entity;
} }
/** /**
* 发送消息 * 发送消息
*
* @param topic * @param topic
* @param tag * @param tag
* @param body * @param body
*/ */
private void sendMsg(String topic, String tag, Object body) { private void sendMsg(String topic, String tag, Object body) {
if(ObjectUtils.isEmpty(body)) { if (ObjectUtils.isEmpty(body)) {
log.error("消息内容为空,[{}]消息将被忽略!",tag); log.error("消息内容为空,[{}]消息将被忽略!", tag);
return; return;
} }
try { try {
...@@ -109,7 +125,7 @@ public class RocketMQAspect ...@@ -109,7 +125,7 @@ public class RocketMQAspect
SendResult sendResult = defaultMQProducer.send(message); SendResult sendResult = defaultMQProducer.send(message);
log.info("消息发送响应:" + sendResult.toString()); log.info("消息发送响应:" + sendResult.toString());
} catch (Exception e) { } catch (Exception e) {
log.error("消息发送异常,"+e); log.error("消息发送异常," + e);
} }
} }
} }
......
...@@ -2,6 +2,7 @@ package cn.ibizlab.util.client; ...@@ -2,6 +2,7 @@ package cn.ibizlab.util.client;
import cn.ibizlab.util.security.AuthenticationUser; import cn.ibizlab.util.security.AuthenticationUser;
import cn.ibizlab.util.security.AuthorizationLogin; import cn.ibizlab.util.security.AuthorizationLogin;
import org.springframework.util.MultiValueMap;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
......
...@@ -5,6 +5,7 @@ import cn.ibizlab.util.security.AuthorizationLogin; ...@@ -5,6 +5,7 @@ import cn.ibizlab.util.security.AuthorizationLogin;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
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 org.springframework.util.MultiValueMap;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
@FeignClient(value = "${ibiz.ref.service.uaa:ibzuaa-api}",contextId = "uaa",fallback = IBZUAAFallback.class) @FeignClient(value = "${ibiz.ref.service.uaa:ibzuaa-api}",contextId = "uaa",fallback = IBZUAAFallback.class)
......
...@@ -7,6 +7,7 @@ import lombok.Data; ...@@ -7,6 +7,7 @@ import lombok.Data;
import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -231,6 +232,15 @@ public class AuthenticationUser implements UserDetails ...@@ -231,6 +232,15 @@ public class AuthenticationUser implements UserDetails
return authuserdetail; return authuserdetail;
} }
public static AuthenticationUser setAuthenticationUser(String userId , String userName) {
AuthenticationUser user = new AuthenticationUser();
user.setUserid(userId);
user.setPersonname(userName);
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(user, null, user.getAuthorities());
SecurityContextHolder.getContext().setAuthentication(authentication);
return user;
}
public Map <String,Object> getSessionParams() public Map <String,Object> getSessionParams()
{ {
if(this.sessionParams==null) if(this.sessionParams==null)
......
...@@ -4,11 +4,17 @@ import feign.RequestInterceptor; ...@@ -4,11 +4,17 @@ import feign.RequestInterceptor;
import feign.RequestTemplate; import feign.RequestTemplate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Enumeration; import java.util.Enumeration;
import java.util.LinkedHashMap;
/** /**
* feign请求拦截器 * feign请求拦截器
...@@ -19,23 +25,23 @@ public class FeignRequestInterceptor implements RequestInterceptor { ...@@ -19,23 +25,23 @@ public class FeignRequestInterceptor implements RequestInterceptor {
private final Logger logger = LoggerFactory.getLogger(getClass()); private final Logger logger = LoggerFactory.getLogger(getClass());
@Override @Override
public void apply(RequestTemplate requestTemplate) { public void apply(RequestTemplate requestTemplate) {
ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); ServletRequestAttributes requestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if(requestAttributes!=null){ if (requestAttributes != null) {
HttpServletRequest request = requestAttributes.getRequest(); HttpServletRequest request = requestAttributes.getRequest();
Enumeration<String> headerNames = request.getHeaderNames(); Enumeration<String> headerNames = request.getHeaderNames();
if (headerNames != null) { if (headerNames != null) {
while (headerNames.hasMoreElements()) { while (headerNames.hasMoreElements()) {
String name = headerNames.nextElement(); String name = headerNames.nextElement();
if(name.equalsIgnoreCase("transfer-encoding")){ if (name.equalsIgnoreCase("transfer-encoding")) {
continue; continue;
} }
String values = request.getHeader(name); String values = request.getHeader(name);
requestTemplate.header(name, values); requestTemplate.header(name, values);
} }
logger.info("feign interceptor header:{}",requestTemplate); logger.info("feign interceptor header:{}", requestTemplate);
} }
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册