gragon.xu 7 years ago
commit 762d7d4cc0

@ -16,7 +16,8 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SOFT_TYPE {
IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件");
IMPP(1, "IMPP", "IMPP平台"), CORE(2, "CORE", "i3业务平台"), WMS(3, "WMS", "仓库管理软件"), MES(4, "MES", "生产管理软件"),
CENTER(99,"CENTER","注册服务中心");
private int value;
private String code;
@ -150,6 +151,7 @@ public class CommonEnumUtil {
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_LOCALE_RESOURCE_TYPE {
COMMON(1, "通用"),EXCEPTION(2, "异常"),
MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮");
@ -299,6 +301,54 @@ public class CommonEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_INFO_STATUS {
INCUMBENT(1, "正常", "正常_NORMAL"),
RESIGNATION(2, "离职", "离职_RESIGNATION");
private int value;
private String code;
private String description;
private USER_INFO_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
*
* 1
@ -502,4 +552,39 @@ public class CommonEnumUtil {
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_ESX {
MALE(1, "男"),
FEMALE(2, "女");
private int value;
private String description;
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
private USER_ESX(int value, String description) {
this.value = value;
this.description = description;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
}

@ -44,6 +44,10 @@ public class RefUserDepartment extends BaseBean {
return userId;
}
}
@Column(name="USER_NAME")
@ApiParam(value ="用户名称")
private String userNameRdd;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example = "-1")
@ -58,16 +62,17 @@ public class RefUserDepartment extends BaseBean {
}
}
@Column(name="RED_DEPARTMENT_NAME")
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称")
private String redDepartmentName;
private String departmentNameRdd;
public RefUserDepartment() {
}
public RefUserDepartment(Long userId, Long departmentId, String redDepartmentName) {
public RefUserDepartment(Long userId, String userName,Long departmentId, String departmentNameRdd) {
this.userId = userId;
this.userNameRdd = userName;
this.departmentId = departmentId;
this.redDepartmentName = redDepartmentName;
this.departmentNameRdd = departmentNameRdd;
}
}

@ -44,6 +44,9 @@ public class RefUserPosition extends BaseBean {
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称")
private String userNameRdd;
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example = "-1")
@ -58,16 +61,17 @@ public class RefUserPosition extends BaseBean {
}
}
@Column(name="RED_POSITION_NAME")
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称")
private String redPositionName;
private String positionNameRdd;
public RefUserPosition() {
}
public RefUserPosition(Long userId, Long positionId, String redPositionName) {
public RefUserPosition(Long userId,String userNameRdd, Long positionId, String positionNameRdd) {
this.userId = userId;
this.userNameRdd = userNameRdd;
this.positionId = positionId;
this.redPositionName = redPositionName;
this.positionNameRdd = positionNameRdd;
}
}

@ -46,6 +46,11 @@ public class RefUserRole extends BaseBean {
return userId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="角色名称")
private String userNameRdd;
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -59,16 +64,16 @@ public class RefUserRole extends BaseBean {
}
}
@Column(name="RED_ROLE_NAME")
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称")
private String redRoleName;
private String roleNameRdd;
public RefUserRole() {
}
public RefUserRole(Long userId, Long roleId, String redRoleName) {
public RefUserRole(Long userId, Long roleId, String roleNameRdd) {
this.userId = userId;
this.roleId = roleId;
this.redRoleName = redRoleName;
this.roleNameRdd = roleNameRdd;
}
}

@ -1,5 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -37,20 +38,7 @@ public class SessionUser implements Serializable {
@ApiParam("用户对象信息")
private SysUserInfo userInfo;
@ApiParam(value = "角色信息",access = "用户所拥有岗位信息集合")
private List<SysRole> roleList;
@ApiParam(value = "岗位信息",access = "用户所拥有岗位信息集合")
private List<Position> positionList;
@ApiParam(value = "部门信息",access = "用户所有用部门信息集合")
private List<Department> departmentList;
@ApiParam(value = "组织信息",access = "用户所拥有的组织信息集合")
private Organize organize;
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
private Position position;
public SessionUser() {
}

@ -33,13 +33,21 @@ public class SysLocaleResource extends BaseBean {
private transient String resourceTypeTxt;
public String getResourceTypeTxt(){
return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
if(this.resourceType != null){
return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
} else {
return null;
}
}
@Column(name="language_code")
@ApiParam(value = "语言编码",example = "浏览器语言编码")
private String languageCode;
@Column(name="language_name_rdd")
@ApiParam(value = "语言名称",example = "浏览器语言名称")
private String languageNameRdd;
@Column(name="resource_key")
@ApiParam(value = "资源KEY",example = "格式A.B全部大写参考命名规范开发文档")
private String resourceKey;

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -33,52 +34,33 @@ public class SysUser extends BaseBean {
private static final long serialVersionUID = 1L;
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@Column(name="USER_INFO_ID")
@ApiParam(value ="用户ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long userInfoId;
public Long getUserInfoId() {
if(userInfoId != null) {
return userInfoId.longValue();
}else{
return userInfoId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称" , access ="用户名称")
private String userName;
@Column(name="USER_LOGIN_NAME")
@ApiParam(value ="登陆名称" , access ="登陆名称")
private String userLoginName;
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@JsonIgnore
@Column(name="USER_LOGIN_PASSWORD")
@ApiParam(value ="登陆密码")
private String userLoginPassword;
@Column(name="USER_TYPE_ID")
@ApiParam(value ="用户类型(枚举,待定)" , example ="-1")
private Integer userTypeId;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
public Long getPositionId() {
if(positionId != null) {
return positionId.longValue();
}else{
return positionId;
}
}
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -92,38 +74,9 @@ public class SysUser extends BaseBean {
}
}
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
public Long getOrganizeId() {
if(organizeId != null) {
return organizeId.longValue();
}else{
return organizeId;
}
}
@Column(name="RED_ROLE_NAME")
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称" , access ="角色名称")
private String redRoleName;
@Column(name="RED_POSITION_NAME")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String redPositionName;
@Column(name="RED_DEPARTMENT_NAME")
@ApiParam(value ="部门名称" , access ="部门名称")
private String redDepartmentName;
@Column(name="RED_ORGANIZE_NAME")
@ApiParam(value ="组织名称" , access ="组织名称")
private String redOrganizeName;
@Column(name="USER_ONLINE_ID")
@ApiParam(value ="是否在线(枚举1.在线2.离线)" , example ="-1")
private Integer userOnlineId;
private String roleNameRdd;
@Column(name="USER_EMAIL")
@ApiParam(value ="邮箱" , access ="邮箱")
@ -135,13 +88,34 @@ public class SysUser extends BaseBean {
@Column(name="USER_STATUS_ID")
@ApiParam(value ="用户状态(枚举1正常,2冻结使用,3账号异常,4离职5服务到期)" , example ="-1")
private Integer userStatusId;
private Integer userStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@ApiParam(value ="用户详细信息")
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="USER_TYPE_ID")
@ApiParam(value ="用户类型(枚举,待定)" , example ="-1")
private Integer userTypeId;
@ApiParam(value ="用户信息")
private transient SysUserInfo userInfo;
@ApiParam(value ="用户所有角色信息")
@ -149,14 +123,4 @@ public class SysUser extends BaseBean {
@ApiParam(value ="用户所有权限信息")
private transient List<SysMenu> menuList;
@ApiParam(value ="用户所有部门信息")
private transient List<Department> departmentList;
@ApiParam(value ="用户所有岗位信息")
private transient List<Position> positionList;
@ApiParam(value ="用户组织信息")
private transient Organize organize;
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -14,6 +15,7 @@ import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
import java.util.List;
/**
* @Description :
@ -34,40 +36,15 @@ public class SysUserInfo extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="USER_EMP_NO")
@ApiParam(value ="工号")
private String userEmpNo;
@Column(name="LANGUAGE_CODE")
@ApiParam(value ="用户语言")
private String languageCode;
@Column(name="RED_DEPARTMENT_NAMES")
@ApiParam(value ="部门集合" , access ="部门集合")
private String redDepartmentNames;
@Column(name="RED_POSITION_NAMES")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String redPositionNames;
@Column(name="RED_ROLE_NAMES")
@ApiParam(value ="角色集合" , access ="角色集合")
private String redRoleNames;
@Column(name="RED_ORGANIZE_NAMES")
@ApiParam(value ="组织集合" , access ="组织集合")
private String redOrganizeNames;
@Column(name="USER_IMAGE_ID")
@ApiParam(value ="用户图像" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -88,7 +65,95 @@ public class SysUserInfo extends BaseBean {
@Column(name="USER_AGE")
@ApiParam(value ="年龄" , example ="1" , access ="年龄")
private Integer userAge;
@Column(name="DEPARTMENT_ID")
@ApiParam(value ="部门ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return departmentId.longValue();
}else{
return departmentId;
}
}
@Column(name="POSITION_ID")
@ApiParam(value ="岗位ID" , example ="-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
public Long getPositionId() {
if(positionId != null) {
return positionId.longValue();
}else{
return positionId;
}
}
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
public Long getOrganizeId() {
if(organizeId != null) {
return organizeId.longValue();
}else{
return organizeId;
}
}
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门集合" , access ="部门集合")
private String departmentNamesRdd;
@Column(name="POSITION_NAMES_RDD")
@ApiParam(value ="岗位集合" , access ="岗位集合")
private String positionNamesRdd;
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织集合" , access ="组织集合")
private String organizeNamesRdd;
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称" , access ="岗位名称")
private String positionNameRdd;
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称" , access ="部门名称")
private String departmentNameRdd;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="USER_ONLINE_STATUS")
@ApiParam(value ="是否在线(枚举1.在线2.离线)" , example ="-1")
private Integer userOnlineStatus;
@Column(name="USER_INFO_STATUS")
@ApiParam(value ="用户状态" , example ="-1")
private Integer userInfoStatus;
@Column(name="USER_LOGIN_LAST_DATE_TIME")
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@ApiParam(value ="用户所有部门信息")
private transient List<Department> departmentList;
@ApiParam(value ="用户所有岗位信息")
private transient List<Position> positionList;
@ApiParam(value ="用户组织信息")
private transient Organize organize;
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
private transient Position position;
@JsonIgnore
@ApiParam(value ="用户详细信息")
private transient SysUser user;
}

@ -31,11 +31,14 @@ import java.text.DecimalFormat;
@Api(value="定时任务",description = "定时任务")
public class TaskTime extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="名称")
private String groupName;
@Column(name="TIME_ID")
@ApiParam(value ="时间表达式ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -52,47 +55,47 @@ public class TaskTime extends BaseBean {
@Column(name="RED_TIME_NAME")
@ApiParam(value ="时间表达式名称")
private String redTimeName;
@Column(name="RED_TIME_EXPRESSION")
@ApiParam(value ="时间表达式")
private String redTimeExpression;
@Column(name="TASK_START_DATE_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartDateTime;
@Column(name="TASK_END_DATE_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndDateTime;
@Column(name="TASK_NUM_SUM")
@ApiParam(value ="执行总次数" , example ="0")
private Integer taskNumSum;
@Column(name="TASK_NUM_RUN")
@ApiParam(value ="执行次数" , example ="0")
private Integer taskNumRun;
@Column(name="TASK_TYPE_ID")
@ApiParam(value ="任务类型枚举1.定时任务)" , example ="-1")
private Integer taskTypeId;
@Column(name="TASK_METHOD")
@ApiParam(value ="执行方法")
private String taskMethod;
@Column(name="TASK_METHOD_TYPE_ID")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodTypeId;
@Column(name="TASK_DESCRIPTION")
@ApiParam(value ="任务描述" , access ="任务描述")
private String taskDescription;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务状态1.正常2.禁用)" , example ="1")
private Integer taskStatus;
@Column(name="LAST_RUN_DATE_TIME")
@ApiParam(value ="最后运行时间" , access ="最后运行时间")
private String lastRunDateTime;

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -26,20 +27,32 @@ import java.text.DecimalFormat;
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="TASK_TIME_EXPRESSION")
@Api(value="系统时间表达式",description = "系统时间表达式")
@Api(value="任务表达式",description = "任务表达式")
public class TaskTimeExpression extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="TIME_EXPRESSION")
@Column(name="GROUP_NAME")
@ApiParam(value ="组名称")
private String groupName;
@Column(name="EXPRESSION_CONTENT")
@ApiParam(value ="表达式内容")
private String timeExpression;
private String expressionContent;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_start_date")
@ApiParam(value ="开始时间")
private String expressionStartDatetime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Column(name="expression_end_date")
@ApiParam(value ="结束时间")
private String expressionEndDatetime;
@Column(name="TIME_DESCRIPTION")
@ApiParam(value ="表达式描述")
private String timeDescription;
private String expressionDescription;
}

@ -286,24 +286,22 @@ public class CoreHqlPack {
}
/**
*
*
* @param user
* @return
*/
public static String packHqlSysUser(SysUser user){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(user.getName(),"name",result);
// And X = X
HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
HqlPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
// And Like % %
HqlPack.getStringLikerPack(user.getUserName(),"userName",result);
HqlPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
HqlPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
HqlPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
HqlPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
HqlPack.getNumLikerPack(user.getUserStatusId(),"userStatusId",result);
HqlPack.getNumLikerPack(user.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(user.getPositionId(),"positionId",result);
HqlPack.getNumEqualPack(user.getRoleId(),"roleId",result);
HqlPack.getNumEqualPack(user.getIsValid(),"isValid",result);
return result.toString();
}
@ -316,13 +314,35 @@ public class CoreHqlPack {
public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){
StringBuffer result = new StringBuffer();
// and
HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
// not
HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result);
return result.toString();
}
/**
*
* @param userInfo
* @return
*/
public static String packHqlSysUserInfo(SysUserInfo userInfo){
StringBuffer result = new StringBuffer();
// And
HqlPack.getNumEqualPack(userInfo.getDepartmentId(),"departmentId",result);
HqlPack.getNumEqualPack(userInfo.getPositionId(),"positionId",result);
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
// Like
HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
return result.toString();
}
/**
*
* @param sysLocaleLanguage
* @return

@ -29,6 +29,9 @@ public class WmsHqlPack {
HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
HqlPack.getStringLikerPack(wmsPOMasterDetails.getZDate(), "zDate", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsValid(), "isValid", result);
HqlPack.getNumEqualPack(wmsPOMasterDetails.getIsDeleted(), "isDeleted", result);
HqlPack.getStringEqualPack(wmsPOMasterDetails.getOrganizeCode(), "organizeCode", result);
return result.toString();
}

Loading…
Cancel
Save