I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

Browse Source
yun-zuoyi
jessica.chen 7 years ago
parent a3d7e3426c 690d9ef408
commit 0d87b466eb
62 changed files with 315 additions and 730 deletions
Show Stats Download Patch File Download Diff File

4
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java
Unescape Escape View File

@ -20,7 +20,9 @@ public class CommonEnumUtil {
CORE(2, "i3core", "i3业务平台"),
WMS(3, "i3wms", "仓库管理软件"),
MES(4, "i3mes", "生产管理软件"),
CENTER(99,"regist-center","注册服务中心");
CLOUD(97,"i3cloud","微服务"),
SURFACE(98,"i3surface","对外服务"),
CENTER(99,"icloud-server","云服务中心");
public int value;
public String code;

18
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -703,19 +703,17 @@ public class WmsEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PART_ABC {
A(1, "A", "正常"),
B(2, "B", "正常"),
C(3, "C", "取消"),
D(4, "D", "取消"),
E(5, "E", "取消");
A(1, "A"),
B(2, "B"),
C(3, "C"),
D(4, "D"),
E(5, "E");
private int value;
private String code;
private String description;
PART_ABC(int value, String code, String description) {
PART_ABC(int value, String description) {
this.value = value;
this.code = code;
this.description = description;
}
@ -727,10 +725,6 @@ public class WmsEnumUtil {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {

6
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -245,7 +245,11 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public T getById(long id) {
return entityManager.find(persistentClass,id);
try{
return entityManager.find(persistentClass,id);
}catch (Exception e){
return null;
}
}
@Override

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java
Unescape Escape View File

@ -1,11 +1,9 @@
package cn.estsh.i3plus.pojo.platform.bean;
import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description : 操作人对象，用于登陆，非持久化
@ -19,6 +17,9 @@ public class SessionUser implements Serializable {
private static final long serialVersionUID = 1L;
@ApiParam("用户ID")
private Long userId;
@ApiParam("用户工号")
private String userCode;
@ -28,9 +29,9 @@ public class SessionUser implements Serializable {
@ApiParam("语言代码")
private String languageCode;
@ApiParam("用户类型")
//CommonEnumUtil.USER_TYPE.xxx.getCode()
private String userTypeId;
@ApiParam("用户类型")
private String userType;
@ApiParam("用户信息")
private SysUser user;
@ -38,8 +39,6 @@ public class SessionUser implements Serializable {
@ApiParam("用户对象信息")
private SysUserInfo userInfo;
public SessionUser() {
}
@ -53,7 +52,7 @@ public class SessionUser implements Serializable {
this.userCode = userCode;
this.userName = userName;
this.languageCode = languageCode;
this.userTypeId = userTypeId;
this.userType = userTypeId;
}
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java
Unescape Escape View File

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 系统配置
@ -29,14 +28,13 @@ import java.text.DecimalFormat;
@Api(value="系统配置",description = "系统配置")
public class SysConfig extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@Column(name="CONFIG_TYPE_ID")
@Column(name="CONFIG_TYPE")
@ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1")
private Integer configTypeId;
private Integer configType;
@Column(name="CONFIG_CODE")
@ApiParam(value ="配置代码")

26
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java
Unescape Escape View File

@ -27,9 +27,9 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="DEPARTMENT")
@Table(name="SYS_DEPARTMENT")
@Api(value="部门",description = "部门")
public class Department extends BaseBean {
public class SysDepartment extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
@ -39,27 +39,19 @@ public class Department extends BaseBean {
@ApiParam(value ="部门代码")
private String departmentCode;
@Column(name="RED_PARENT_NAME")
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="父节点名称")
private String redParentName;
private String parentNameRdd;
// 根节点-1
@Column(name="PARENT_ID")
@ApiParam(value ="父节点ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
// 根节点-1
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="RED_ORGANIZATION_NAME")
@Column(name="ORGANIZATION_NAME_RDD")
@ApiParam(value ="所属组织名称" , access ="所属组织名称")
private String redOrganizeName;
private String organizeNameRdd;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="所属组织" , example = "0")
@ -71,6 +63,6 @@ public class Department extends BaseBean {
private Integer departmentSort;
@ApiParam(value ="子集列表")
private transient List<Department> childList;
private transient List<SysDepartment> childList;
}

21
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 系统字典
@ -38,28 +37,20 @@ public class SysDictionary extends BaseBean {
@Column(name="DICTIONARY_CODE")
@ApiParam(value ="字典代码")
private String dictionaryCode;
// 根节点-1
@Column(name="PARENT_ID")
@ApiParam(value ="父节点" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
// 根节点-1
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="RED_PARENT_NAME")
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="父级节点名称")
private String redParentName;
private String parentNameRdd;
@Column(name="RED_PARENT_CODEE")
@Column(name="PARENT_CODEE_RDD")
@ApiParam(value ="父级节点代码")
private String redParentCode;
private String parentCodeRdd;
@Column(name="DICTIONARY_VALUE")
@ApiParam(value ="字典值")

38
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java
Unescape Escape View File

@ -1,38 +0,0 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 用户登陆表
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-10-11 11:02
* @Modify:
**/
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name="sys_employee")
@Api(value="用户登陆表",description = "用户登陆系统账户。")
public class SysEmployee extends BaseBean {
@Column(name="language_name")
@ApiParam(value = "语言名称",example = "前台显示的名称")
private String username;
@Column(name="language_code")
@ApiParam(value = "语言代码",example = "使用浏览器语言代码，参考java.util.Locale中的代码。CN/zh，TW/zh，HK/zh，US/en, FR/en,GB/en,JP/en,DE/en,KR/en")
private String password;
@Column(name="is_default")
@ApiParam(value = "是否默认",example = "1")
private Integer isDefault;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java
Unescape Escape View File

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 企业信息
@ -25,11 +24,10 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ENTERPRISE")
@Table(name="SYS_ENTERPRISE")
@Api(value="企业信息",description = "企业信息")
public class Enterprise extends BaseBean {
public class SysEnterprise extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java
Unescape Escape View File

@ -27,11 +27,10 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ENTERPRISE_CONFIG")
@Table(name="SYS_ENTERPRISE_CONFIG")
@Api(value="企业配置信息",description = "企业配置信息")
public class EnterpriseConfig extends BaseBean {
public class SysEnterpriseConfig extends BaseBean {
@Column(name="ENTERPRISE_ID")
@ApiParam(value ="企业id" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
@ -41,9 +40,9 @@ public class EnterpriseConfig extends BaseBean {
@ApiParam(value ="配置名称" , access ="配置名称")
private String enterpriseConfigName;
@Column(name="CONFIG_TYPE_ID")
@Column(name="CONFIG_TYPE")
@ApiParam(value ="配置类型" , example ="0" , access ="配置类型")
private Integer configTypeId;
private Integer configType;
@Column(name="CONFIG_PARENT_ID")
@ApiParam(value ="配置父节点" , access ="配置父节点")

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java
Unescape Escape View File

@ -27,11 +27,11 @@ import javax.persistence.Table;
@Table(name="SYS_EXCEPTION")
@Api(value="系统异常表",description = "记录系统出现的异常")
public class SysException extends BaseBean {
//CommonEnumUtil.SOFT_TYPE
@Column(name="EXC_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
//CommonEnumUtil.SOFT_TYPE
private Integer excModuleId;
private Integer excModule;
@Column(name="EXC_CLASS_NAME")
@ApiParam(value ="异常类名")

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java
Unescape Escape View File

@ -23,9 +23,9 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="factory_store")
@Table(name="SYS_FACTORY_STORE")
@Api("工厂仓库")
public class FactoryStore extends BaseBean {
public class SysFactoryStore extends BaseBean {
@Column(name="store_code")
@ApiParam("仓库代码")

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java
Unescape Escape View File

@ -40,14 +40,6 @@ public class SysFile extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="DFS_GROUP_NAME")
@ApiParam(value ="FastDfs Group 名称(后台使用)")
private String dfsGroupName;
@ -67,7 +59,11 @@ public class SysFile extends BaseBean {
@Column(name="FILE_TYPE_ID")
@ApiParam(value ="文件类型ID")
private Long fileTypeId;
@Column(name="FILE_TYPE_NAME_RDD")
@ApiParam(value ="文件类型ID")
private Long fileTypeNameRdd;
@Column(name="FILE_TYPE_NAME")
@ApiParam(value ="文件类型名称")
private String fileTypeName;

3
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
Unescape Escape View File

@ -32,6 +32,7 @@ public class SysLocaleResource extends BaseBean {
private Integer resourceType;
private transient String resourceTypeTxt;
public String getResourceTypeTxt(){
if(this.resourceType != null){
return CommonEnumUtil.SYS_LOCALE_RESOURCE_TYPE.valueOf(this.resourceType);
@ -56,8 +57,8 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
private String resourceValue;
//系统自带需要有初始化表，只能修改value，无法删除。
@Column(name="is_system")
@ApiParam(value = "是否系统参数",example = "2")
//系统自带需要有初始化表，只能修改value，无法删除。
private Integer isSystem;
}

38
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java
Unescape Escape View File

@ -1,6 +1,8 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -11,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 用户操作日志表
@ -25,21 +26,42 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LOG_OPERATE")
@Table(name="SYS_LOG_OPERATE")
@Api(value="操作日志表",description = "操作日志表")
public class LogOperate extends BaseBean {
public class SysLogOperate extends BaseBean {
@Column(name="OPERATE_MODULE_ID")
@ApiParam(value ="系统模块（枚举）", example = "1")
//CommonEnumUtil.SOFT_TYPE
private Integer operateModuleId;
@Column(name="OPERATE_MODULE")
@ApiParam(value ="系统模块（枚举）", example = "1")
private Integer operateModule;
@Column(name="OPERATE_TYPE_ID")
//ImppEnumUtil.OPERATE_TYPE（枚举）
@Column(name="OPERATE_TYPE")
@ApiParam(value ="操作类型" , example = "-1")
private Integer operateTypeId;
private Integer operateType;
@Column(name="OPERATE_MESSAGE")
@ApiParam(value ="操作信息" , access ="操作信息")
private String operateMessage;
@Column(name="REMOTE_IP")
@ApiParam(value ="请求IP" , access ="请求IP")
private String remoteIp;
@Column(name="REQUEST_URL")
@ApiParam(value ="请求路径" , access ="请求路径")
private String requestUrl;
@Column(name="HTTP_METHOD")
@ApiParam(value ="http请求方法" , access ="http请求方法")
private String httpMethod;
@Column(name="LOG_ARGS")
@ApiParam(value ="方法入参" , access ="方法入参")
private String logArgs;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 系统日志表
@ -27,9 +26,9 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LOG_SYSTEM")
@Table(name="SYS_LOG_SYSTEM")
@Api(value="系统日志表",description = "系统日志表")
public class LogSystem extends BaseBean {
public class SysLogSystem extends BaseBean {
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志级别" , example ="1")
@ -79,7 +78,6 @@ public class LogSystem extends BaseBean {
@Column(name="SERVER_HOST")
@ApiParam(value ="服务器")
//hostName + ip
private String serverHost;
@Column(name="EXECUTE_TIME")

13
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java
Unescape Escape View File

@ -11,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 用户登录记录
@ -25,9 +24,9 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LOG_USER_LOGIN")
@Table(name="SYS_LOG_USER_LOGIN")
@Api(value="用户登录记录",description = "用户登录记录")
public class LogUserLogin extends BaseBean {
public class SysLogUserLogin extends BaseBean {
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , access ="用户ID")
@ -41,13 +40,9 @@ public class LogUserLogin extends BaseBean {
@ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1")
private Integer logLoginStatus;
@Column(name="LOG_LOGIN_PLATFORM_ID")
@Column(name="LOG_LOGIN_PLATFORM")
@ApiParam(value ="登录平台ID（枚举）" , example ="1")
private Integer logLoginPlatformId;
@Column(name="LOG_LOGIN_PLATFORM_NAME")
@ApiParam(value ="登录平台名称（枚举）")
private String redLogLoginPlatformName;
private Integer logLoginPlatform;
@Column(name="LOG_LOGIN_HOST")
@ApiParam(value ="登录IP" , access ="登录IP")

17
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
import java.util.List;
/**
@ -40,24 +39,16 @@ public class SysMenu extends BaseBean {
@ApiParam(value ="功能代码")
private String menuCode;
@Column(name="MENU_TYPE_ID")
@Column(name="MENU_TYPE")
@ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1")
private Integer menuTypeId;
private Integer menuType;
// 根节点-1
@Column(name="PARENT_ID")
@ApiParam(value ="父级功能ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
// 根节点-1
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="父级功能名称" , access ="父级功能名称")
private String parentNameRdd;

9
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 系统消息
@ -52,14 +51,6 @@ public class SysMessage extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long messageSenderId;
public Long getMessageSenderId() {
if(messageSenderId != null) {
return messageSenderId.longValue();
}else{
return messageSenderId;
}
}
@Column(name="MESSAGE_SENDER_NAME_RDD")
@ApiParam(value ="发送者名称" )
private String messageSenderNameRdd;

55
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java
Unescape Escape View File

@ -1,55 +0,0 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 用户登陆表
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-10-11 11:02
* @Modify:
**/
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_METHOD")
@Api(value="功能权限表",description = "功能权限包含模块、功能及按钮等权限。")
public class SysMethod extends BaseBean {
@Column(name="method_code")
@ApiParam(value = "功能编码",example = "0")
private Integer methodCode;
@Column(name="method_name")
@ApiParam(value = "语言名称",example = "前台显示的名称")
private String methodName;
@Column(name="method_level")
@ApiParam(value = "语言名称",example = "前台显示的名称")
//CommonEnumUtil.METHOD_LEVEL，分为模块、功能和按钮
private Integer methodLevel;
@Column(name="method_uri")
@ApiParam(value = "方法路径",example = "前台显示的名称")
private String methodUri;
@Column(name="parent_method_id")
@ApiParam(value = "上级方法主键")
private Long parentMethodId;
public Long getParentMethodId() {
if(parentMethodId != null) {
return parentMethodId.longValue();
}else{
return parentMethodId;
}
}
}

50
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java
Unescape Escape View File

@ -1,50 +0,0 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 用户登陆表
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-10-11 11:02
* @Modify:
**/
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_METHOD_ROLE")
@Api(value="角色权限表",description = "关联角色和权限。")
public class SysMethodRole extends BaseBean {
@Column(name="ROLE_ID")
@ApiParam(value = "角色主键")
private Long roleId;
public Long getRoleId() {
if(roleId != null) {
return roleId.longValue();
}else{
return roleId;
}
}
@Column(name="method_id")
@ApiParam(value = "功能权限主键")
private Long methodId;
public Long getMethodId() {
if(methodId != null) {
return methodId.longValue();
}else{
return methodId;
}
}
}

26
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java
Unescape Escape View File

@ -28,11 +28,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="ORGANIZE")
@Table(name="SYS_ORGANIZE")
@Api(value="组织",description = "组织")
public class Organize extends BaseBean {
public class SysOrganize extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
private String name;
@ -41,9 +40,9 @@ public class Organize extends BaseBean {
@ApiParam(value ="组织代码")
private String organizeCode;
@Column(name="ORGANIZE_TYPE_ID")
@Column(name="ORGANIZE_TYPE")
@ApiParam(value ="组织类型ID（枚举：1.集团，2.公司，3.工厂）" , example ="1")
private Integer organizeTypeId;
private Integer organizeType;
// 默认值 -1
@Column(name="PARENT_ID")
@ -51,16 +50,9 @@ public class Organize extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="RED_PARENT_NAME")
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="父节点")
private String redParentName;
private String parentNameRdd;
@Column(name="ORGANIZE_DESCRIPTION")
@ApiParam(value ="组织描述")
@ -70,10 +62,10 @@ public class Organize extends BaseBean {
@ApiParam(value ="排序" , example ="1")
private Integer organizeSort;
@Column(name="ORGANIZE_STATUS_ID")
@Column(name="ORGANIZE_STATUS")
@ApiParam(value ="组织状态（枚举：1.正常，2.禁用）" , example ="1")
private Integer organizeStatusId;
private Integer organizeStatus;
@ApiParam(value ="子集列表")
private transient List<Organize> childList;
private transient List<SysOrganize> childList;
}

19
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java
Unescape Escape View File

@ -27,11 +27,10 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="POSITION")
@Table(name="SYS_POSITION")
@Api(value="岗位",description = "岗位")
public class Position extends BaseBean {
public class SysPosition extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@ -46,23 +45,15 @@ public class Position extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="RED_PARENT_NAME")
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="上级岗位名称" , access ="上级岗位名称")
private String redParentName;
private String parentNameRdd;
@Column(name="POSITION_DESCRIPTION")
@ApiParam(value ="描述" , access ="描述")
private String positionDescription;
@ApiParam(value ="子部门列表")
private transient List<Position> childList;
private transient List<SysPosition> childList;
}

12
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefExpressionTrigger.java
Unescape Escape View File

@ -26,23 +26,15 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_EXPRESSION_TRIGGER")
@Table(name="SYS_REF_EXPRESSION_TRIGGER")
@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
public class RefExpressionTrigger extends BaseBean {
public class SysRefExpressionTrigger extends BaseBean {
@Column(name="EXPRESSION_ID")
@ApiParam(value ="表达式_ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long expressionId;
public Long getExpressionId() {
if(expressionId != null) {
return expressionId.longValue();
}else{
return expressionId;
}
}
@Column(name="TRIGGER_NAME")
@ApiParam(value ="触发器名称")
private String triggerName;

43
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java
Unescape Escape View File

@ -27,52 +27,39 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_ROLE_MENU")
@Table(name="SYS_REF_ROLE_MENU")
@Api(value="关系-角色菜单",description = "关系-角色菜单")
public class RefRoleMenu extends BaseBean {
public class SysRefRoleMenu extends BaseBean {
@Column(name="MENU_ID")
@ApiParam(value ="菜单ID" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long menuId;
public Long getMenuId() {
if(menuId != null) {
return menuId.longValue();
}else{
return menuId;
}
}
@Column(name="RED_MENU_NAME")
@Column(name="MENU_NAME_RDD")
@ApiParam(value ="菜单名称" , access ="菜单名称")
private String redMenuName;
private String menuNameRdd;
@Column(name="MENU_TYPE_RDD")
@ApiParam(value ="菜单类型")
private Integer menuTypeRdd;
@Column(name="ROLE_ID")
@ApiParam(value ="角色ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
public Long getRoleId() {
if(roleId != null) {
return roleId.longValue();
}else{
return roleId;
}
}
@Column(name="RED_ROLE_NAME")
@Column(name="ROLE_NAME_Rdd")
@ApiParam(value ="角色名称" , access ="角色名称")
private String redRoleName;
private String roleNameRdd;
public RefRoleMenu() {
public SysRefRoleMenu() {
}
public RefRoleMenu(Long menuId, String redMenuName, Long roleId, String redRoleName) {
public SysRefRoleMenu(Long menuId, String menuNameRdd, Long roleId, String roleNameRdd) {
this.menuId = menuId;
this.redMenuName = redMenuName;
this.menuNameRdd = menuNameRdd;
this.roleId = roleId;
this.redRoleName = redRoleName;
this.roleNameRdd = roleNameRdd;
}
}

24
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java
Unescape Escape View File

@ -27,24 +27,15 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_USER_DEPARTMENT")
@Table(name="SYS_REF_USER_DEPARTMENT")
@Api(value="关系-用户部门",description = "关系-用户部门")
public class RefUserDepartment extends BaseBean {
public class SysRefUserDepartment extends BaseBean {
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="USER_NAME")
@ApiParam(value ="用户名称")
private String userNameRdd;
@ -54,22 +45,15 @@ public class RefUserDepartment extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
public Long getDepartmentId() {
if(departmentId != null) {
return userId.longValue();
}else{
return departmentId;
}
}
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称")
private String departmentNameRdd;
public RefUserDepartment() {
public SysRefUserDepartment() {
}
public RefUserDepartment(Long userId, String userName,Long departmentId, String departmentNameRdd) {
public SysRefUserDepartment(Long userId, String userName,Long departmentId, String departmentNameRdd) {
this.userId = userId;
this.userNameRdd = userName;
this.departmentId = departmentId;

21
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserMessage.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java
Unescape Escape View File

@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
@ -27,23 +26,15 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_USER_MESSAGE")
@Table(name="SYS_REF_USER_MESSAGE")
@Api(value="关系-表达式与触发器",description = "关系-表达式与触发器")
public class RefUserMessage extends BaseBean {
public class SysRefUserMessage extends BaseBean {
@Column(name="MESSAGE_ID")
@ApiParam(value ="消息id" ,example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long messageId;
public Long getMessageId(){
if(messageId != null) {
return messageId.longValue();
}else{
return messageId;
}
}
@Column(name="MESSAGE_TITLE_RDD")
@ApiParam(value ="冗余消息标题")
private String messageTitleRdd;
@ -57,14 +48,6 @@ public class RefUserMessage extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long receiverId;
public Long getReceiverId(){
if(receiverId != null) {
return receiverId.longValue();
}else{
return receiverId;
}
}
@Column(name="RECEIVER_NAME_RDD")
@ApiParam(value ="接收者名称" ,example = "-1")
private String receiverNameRdd;

25
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 关系-用户岗位
@ -27,23 +26,15 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_USER_POSITION")
@Table(name="SYS_REF_USER_POSITION")
@Api(value="关系-用户岗位",description = "关系-用户岗位")
public class RefUserPosition extends BaseBean {
public class SysRefUserPosition extends BaseBean {
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="用户名称")
private String userNameRdd;
@ -53,22 +44,14 @@ public class RefUserPosition extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long positionId;
public Long getPositionId() {
if(positionId != null) {
return positionId.longValue();
}else{
return positionId;
}
}
@Column(name="POSITION_NAME_RDD")
@ApiParam(value ="岗位名称")
private String positionNameRdd;
public RefUserPosition() {
public SysRefUserPosition() {
}
public RefUserPosition(Long userId,String userNameRdd, Long positionId, String positionNameRdd) {
public SysRefUserPosition(Long userId,String userNameRdd, Long positionId, String positionNameRdd) {
this.userId = userId;
this.userNameRdd = userNameRdd;
this.positionId = positionId;

26
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 关系-用户角色
@ -27,26 +26,17 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="REF_USER_ROLE")
@Table(name="SYS_REF_USER_ROLE")
@Api(value="关系-用户角色",description = "关系-用户角色")
public class RefUserRole extends BaseBean {
public class SysRefUserRole extends BaseBean {
private static final long serialVersionUID = 1L;
@Column(name="USER_ID")
@ApiParam(value ="用户ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="USER_NAME_RDD")
@ApiParam(value ="角色名称")
private String userNameRdd;
@ -56,22 +46,14 @@ public class RefUserRole extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
public Long getRoleId() {
if(roleId != null) {
return roleId.longValue();
}else{
return roleId;
}
}
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称")
private String roleNameRdd;
public RefUserRole() {
public SysRefUserRole() {
}
public RefUserRole(Long userId, Long roleId, String roleNameRdd) {
public SysRefUserRole(Long userId, Long roleId, String roleNameRdd) {
this.userId = userId;
this.roleId = roleId;
this.roleNameRdd = roleNameRdd;

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java
Unescape Escape View File

@ -5,12 +5,10 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import javafx.scene.text.TextBoundsType;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -49,14 +47,6 @@ public class SysRole extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
public Long getParentId() {
if(parentId != null) {
return parentId.longValue();
}else{
return parentId;
}
}
@Column(name="PARENT_NAME_RDD")
@ApiParam(value ="角色父节点名称" , access ="角色父节点名称")
private String parentNameRdd;

23
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTime.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 定时任务
@ -27,9 +26,9 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="TASK_TIME")
@Table(name="SYS_TASK_TIME")
@Api(value="定时任务",description = "定时任务")
public class TaskTime extends BaseBean {
public class SysTaskTime extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")
@ -44,15 +43,7 @@ public class TaskTime extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long timeExpressionId;
public Long getTimeExpressionId() {
if(timeExpressionId != null) {
return timeExpressionId.longValue();
}else{
return timeExpressionId;
}
}
@Column(name="RED_TIME_NAME")
@Column(name="TIME_NAME_Rdd")
@ApiParam(value ="时间表达式名称")
private String timeExpressionNameRdd;
@ -68,13 +59,13 @@ public class TaskTime extends BaseBean {
@ApiParam(value ="执行次数" , example ="0")
private Integer taskNumRun;
@Column(name="TASK_TYPE_ID")
@Column(name="TASK_TYPE")
@ApiParam(value ="任务类型（枚举：1.定时任务）" , example ="-1")
private Integer taskTypeId;
private Integer taskType;
@Column(name="TASK_METHOD_TYPE_ID")
@Column(name="TASK_METHOD_TYPE")
@ApiParam(value ="任务执行类型" ,example = "-1")
private Integer taskMethodTypeId;
private Integer taskMethodType;
@Column(name="TASK_PACKAGE")
@ApiParam(value ="任务包名")

5
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java
Unescape Escape View File

@ -12,7 +12,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 定时任务时间表达式
@ -26,9 +25,9 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="TASK_TIME_EXPRESSION")
@Table(name="SYS_TASK_TIME_EXPRESSION")
@Api(value="任务表达式",description = "任务表达式")
public class TaskTimeExpression extends BaseBean {
public class SysTaskTimeExpression extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称")

34
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 定时任务执行记录
@ -27,44 +26,27 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="TASK_TIME_RECORDING")
@Table(name="SYS_TASK_TIME_RECORDING")
@Api(value="定时任务执行记录",description = "定时任务执行记录")
public class TaskTimeRecording extends BaseBean {
public class SysTaskTimeRecording extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="任务名称")
private String name;
@Column(name="TIMED_TASK_ID")
@Column(name="TIME_TASK_ID")
@ApiParam(value ="任务编号" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timedTaskId;
private Long timeTaskId;
public Long getTimedTaskId() {
if(timedTaskId != null) {
return timedTaskId.longValue();
}else{
return timedTaskId;
}
}
@Column(name="RED_TIME_ID")
@Column(name="TIME_ID")
@ApiParam(value ="时间表达式ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long redTimeId;
private Long timeId;
public Long getRedTimeId() {
if(redTimeId != null) {
return redTimeId.longValue();
}else{
return redTimeId;
}
}
@Column(name="RED_TIME_EXPRESSION")
@Column(name="TIME_EXPRESSION_RDD")
@ApiParam(value ="时间表达式")
private String redTimeExpression;
private String timeExpressionRdd;
@Column(name="TASK_START_DATE_TIME")
@ApiParam(value ="任务开始时间")

30
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java
Unescape Escape View File

@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
/**
* @Description : 硬件设备表
@ -27,11 +26,10 @@ import java.text.DecimalFormat;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="TOOL")
@Table(name="SYS_TOOL")
@Api(value="硬件设备表",description = "硬件设备表")
public class Tool extends BaseBean {
public class SysTool extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;
@ -41,21 +39,13 @@ public class Tool extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long toolTypeId;
public Long getToolTypeId() {
if(toolTypeId != null) {
return toolTypeId.longValue();
}else{
return toolTypeId;
}
}
@Column(name="RED_TOOL_TYPE_NAME")
@Column(name="TOOL_TYPE_NAME_RDD")
@ApiParam(value ="类型名称" , access ="类型名称")
private String redToolTypeName;
private String toolTypeNameRdd;
@Column(name="TOOL_STATUS_ID")
@Column(name="TOOL_STATUS")
@ApiParam(value ="设备状态（枚举：枚举：1.正常，2.禁用）" , example ="-1")
private Integer toolStatusId;
private Integer toolStatus;
@Column(name="TOOL_IP")
@ApiParam(value ="IP地址" , access ="IP地址")
@ -65,13 +55,13 @@ public class Tool extends BaseBean {
@ApiParam(value ="端口" , example ="80" , access ="端口")
private Integer toolPort;
@Column(name="TOOL_CONN_TYPE_ID")
@Column(name="TOOL_CONN_TYPE")
@ApiParam(value ="连接方式（枚举：1.网口，2.串口，3.USB......）" , example ="-1")
private Integer toolConnTypeId;
private Integer toolConnType;
@Column(name="TOOL_DATA_TYPE_ID")
@Column(name="TOOL_DATA_TYPE")
@ApiParam(value ="传输数据类型（枚举：1.字符串，2.二进制数据流....）" , example ="-1")
private Integer toolDataTypeId;
private Integer toolDataType;
@Column(name="TOOL_OPERATING")
@ApiParam(value ="操作内容" , access ="操作内容")

5
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java
Unescape Escape View File

@ -22,14 +22,13 @@ import java.text.DecimalFormat;
**/
@Data
@Entity
@Table(name="TOOL_TYPE")
@Table(name="SYS_TOOL_TYPE")
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Api(value="设备类型",description = "设备类型")
public class ToolType extends BaseBean {
public class SysToolType extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="名称" , access ="名称")
private String name;

33
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java
Unescape Escape View File

@ -1,7 +1,6 @@
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;
@ -39,14 +38,6 @@ public class SysUser extends BaseBean {
@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;
@ -64,14 +55,6 @@ public class SysUser extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
public Long getRoleId() {
if(roleId != null) {
return roleId.longValue();
}else{
return roleId;
}
}
@Column(name="ROLE_NAME_RDD")
@ApiParam(value ="角色名称" , access ="角色名称")
private String roleNameRdd;
@ -92,26 +75,22 @@ public class SysUser extends BaseBean {
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@Column(name="USER_LOGIN_NUM")
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@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")
@Column(name="USER_TYPE")
@ApiParam(value ="用户类型（枚举，待定）" , example ="-1")
private Integer userTypeId;
private Integer userType;
@ApiParam(value ="用户信息")
private transient SysUserInfo userInfo;

45
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -14,7 +14,6 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
import java.util.List;
/**
@ -50,14 +49,6 @@ public class SysUserInfo extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long userImageId;
public Long getUserImageId() {
if(userImageId != null) {
return userImageId.longValue();
}else{
return userImageId;
}
}
@Column(name="USER_SEX")
@ApiParam(value ="性别（1.男，2.女）" , example ="1" , access ="性别（1.男，2.女）")
private Integer userSex;
@ -71,40 +62,16 @@ public class SysUserInfo extends BaseBean {
@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;
@ -141,17 +108,21 @@ public class SysUserInfo extends BaseBean {
@ApiParam(value ="用户最后登录时间")
private String userLoginLastDateTime;
@Column(name="USER_LOGIN_NUM")
@ApiParam(value ="登录次数",example = "0")
private Integer userLoginNum;
@ApiParam(value ="用户所有部门信息")
private transient List<Department> departmentList;
private transient List<SysDepartment> departmentList;
@ApiParam(value ="用户所有岗位信息")
private transient List<Position> positionList;
private transient List<SysPosition> positionList;
@ApiParam(value ="用户组织信息")
private transient Organize organize;
private transient SysOrganize organize;
@ApiParam(value = "岗位信息",access = "用户主岗位信息")
private transient Position position;
private transient SysPosition position;
@JsonIgnore
@ApiParam(value ="用户详细信息")

50
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java
Unescape Escape View File

@ -1,50 +0,0 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
* @Description : 用户登陆表
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2018-10-11 11:02
* @Modify:
**/
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name="sys_user_role")
@Api(value="用户角色表",description = "关联用户和角色。")
public class SysUserRole extends BaseBean {
@Column(name="user_id")
@ApiParam(value = "用户主键")
private Long userId;
public Long getUserId() {
if(userId != null) {
return userId.longValue();
}else{
return userId;
}
}
@Column(name="language_code")
@ApiParam(value = "角色主键")
private Long roleId;
public Long getRoleId() {
if(roleId != null) {
return roleId.longValue();
}else{
return roleId;
}
}
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DepartmentRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDepartmentRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.Department;
import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
/**
* @Description : 部门
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.Department;
* @Date : 2018-10-22 12:02:59.954
* @Modify :
**/
public interface DepartmentRepository extends BaseRepository<Department, Long> {
public interface SysDepartmentRepository extends BaseRepository<SysDepartment, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseConfigRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseConfigRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.EnterpriseConfig;
import cn.estsh.i3plus.pojo.platform.bean.SysEnterpriseConfig;
/**
* @Description : 企业配置信息
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.EnterpriseConfig;
* @Date : 2018-10-22 12:03:00.074
* @Modify :
**/
public interface EnterpriseConfigRepository extends BaseRepository<EnterpriseConfig, Long> {
public interface SysEnterpriseConfigRepository extends BaseRepository<SysEnterpriseConfig, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.Enterprise;
import cn.estsh.i3plus.pojo.platform.bean.SysEnterprise;
/**
* @Description : 企业信息
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.Enterprise;
* @Date : 2018-10-22 12:03:00.008
* @Modify :
**/
public interface EnterpriseRepository extends BaseRepository<Enterprise, Long> {
public interface SysEnterpriseRepository extends BaseRepository<SysEnterprise, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogUserLoginRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserLoginRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.LogUserLogin;
import cn.estsh.i3plus.pojo.platform.bean.SysLogUserLogin;
/**
* @Description : 用户登录记录
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogUserLogin;
* @Date : 2018-10-22 12:03:00.207
* @Modify :
**/
public interface LogUserLoginRepository extends BaseRepository<LogUserLogin, Long> {
public interface SysLogUserLoginRepository extends BaseRepository<SysLogUserLogin, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/OrganizeRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrganizeRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.Organize;
import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
/**
* @Description : 组织
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.Organize;
* @Date : 2018-10-22 12:03:00.286
* @Modify :
**/
public interface OrganizeRepository extends BaseRepository<Organize, Long> {
public interface SysOrganizeRepository extends BaseRepository<SysOrganize, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/PositionRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPositionRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.Position;
import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
/**
* @Description : 岗位
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.Position;
* @Date : 2018-10-22 12:03:00.375
* @Modify :
**/
public interface PositionRepository extends BaseRepository<Position, Long> {
public interface SysPositionRepository extends BaseRepository<SysPosition, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefExpressionTrigger;
import cn.estsh.i3plus.pojo.platform.bean.SysRefExpressionTrigger;
/**
* @Description : 关系-表达式与触发器
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefExpressionTrigger;
* @CreateDate : 2018-11-14 13:36
* @Modify:
**/
public interface RefExpressionTriggerRepository extends BaseRepository<RefExpressionTrigger, Long> {
public interface SysRefExpressionTriggerRepository extends BaseRepository<SysRefExpressionTrigger, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefRoleMenuRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefRoleMenuRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu;
import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu;
/**
* @Description : 关系-角色菜单
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefRoleMenu;
* @Date : 2018-10-22 12:03:00.506
* @Modify :
**/
public interface RefRoleMenuRepository extends BaseRepository<RefRoleMenu, Long> {
public interface SysRefRoleMenuRepository extends BaseRepository<SysRefRoleMenu, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserDepartmentRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefUserDepartment;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
/**
* @Description : 关系-用户部门
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserDepartment;
* @Date : 2018-10-22 12:03:00.596
* @Modify :
**/
public interface RefUserDepartmentRepository extends BaseRepository<RefUserDepartment, Long> {
public interface SysRefUserDepartmentRepository extends BaseRepository<SysRefUserDepartment, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserMessageRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserMessageRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
/**
* @Description : 关系-用户消息
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserMessage;
* @CreateDate : 2018-11-15 20:45
* @Modify:
**/
public interface RefUserMessageRepository extends BaseRepository<RefUserMessage,Long> {
public interface SysRefUserMessageRepository extends BaseRepository<SysRefUserMessage,Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserPositionRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserPositionRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefUserPosition;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserPosition;
/**
* @Description : 关系-用户岗位
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserPosition;
* @Date : 2018-10-22 12:03:00.727
* @Modify :
**/
public interface RefUserPositionRepository extends BaseRepository<RefUserPosition, Long> {
public interface SysRefUserPositionRepository extends BaseRepository<SysRefUserPosition, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserRoleRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserRoleRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.RefUserRole;
import cn.estsh.i3plus.pojo.platform.bean.SysRefUserRole;
/**
* @Description : 关系-用户角色
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.RefUserRole;
* @Date : 2018-10-22 12:03:00.825
* @Modify :
**/
public interface RefUserRoleRepository extends BaseRepository<RefUserRole, Long> {
public interface SysRefUserRoleRepository extends BaseRepository<SysRefUserRole, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeExpressionRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeExpression;
/**
* @Description : 定时任务时间表达式
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.TaskTimeExpression;
* @Date : 2018-10-22 12:03:01.252
* @Modify :
**/
public interface TaskTimeExpressionRepository extends BaseRepository<TaskTimeExpression, Long> {
public interface SysTaskTimeExpressionRepository extends BaseRepository<SysTaskTimeExpression, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRecordingRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.TaskTimeRecording;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording;
/**
* @Description : 定时任务执行记录
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.TaskTimeRecording;
* @Date : 2018-10-22 12:03:01.409
* @Modify :
**/
public interface TaskTimeRecordingRepository extends BaseRepository<TaskTimeRecording, Long> {
public interface SysTaskTimeRecordingRepository extends BaseRepository<SysTaskTimeRecording, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTime;
/**
* @Description : 定时任务
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.TaskTime;
* @Date : 2018-10-22 12:03:01.372
* @Modify :
**/
public interface TaskTimeRepository extends BaseRepository<TaskTime, Long> {
public interface SysTaskTimeRepository extends BaseRepository<SysTaskTime, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.Tool;
import cn.estsh.i3plus.pojo.platform.bean.SysTool;
/**
* @Description : 硬件设备表
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.Tool;
* @Date : 2018-10-22 12:03:01.445
* @Modify :
**/
public interface ToolRepository extends BaseRepository<Tool, Long> {
public interface SysToolRepository extends BaseRepository<SysTool, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolTypeRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.ToolType;
import cn.estsh.i3plus.pojo.platform.bean.SysToolType;
/**
* @Description : 设备类型
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.ToolType;
* @Date : 2018-10-22 12:03:01.486
* @Modify :
**/
public interface ToolTypeRepository extends BaseRepository<ToolType, Long> {
public interface SysToolTypeRepository extends BaseRepository<SysToolType, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
/**
* @Description : 操作日志表(使用Mongodb)
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
* @Date : 2018-10-22 12:03:00.118
* @Modify :
**/
public interface LogOperateRepository extends BaseMongoRepository<LogOperate, Long> {
public interface SysLogOperateRepository extends BaseMongoRepository<SysLogOperate, Long> {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java
Unescape Escape View File

@ -1,9 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
import org.springframework.data.mongodb.repository.MongoRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
/**
* @Description : 系统日志表
@ -12,5 +10,5 @@ import org.springframework.data.mongodb.repository.MongoRepository;
* @Date : 2018-10-22 12:03:00.158
* @Modify :
**/
public interface LogSystemRepository extends BaseMongoRepository<LogSystem, Long> {
public interface SysLogSystemRepository extends BaseMongoRepository<SysLogSystem, Long> {
}

15
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java
Unescape Escape View File

@ -1,14 +1,11 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
import cn.estsh.i3plus.pojo.platform.bean.LogOperate;
import cn.estsh.i3plus.pojo.platform.bean.LogSystem;
import cn.estsh.i3plus.pojo.platform.bean.SysLogOperate;
import cn.estsh.i3plus.pojo.platform.bean.SysLogSystem;
import com.mongodb.BasicDBObject;
import com.mongodb.client.model.Filters;
import org.bson.conversions.Bson;
import java.util.regex.Pattern;
/**
* @Description : Bson对象封装
* @Reference :
@ -23,7 +20,7 @@ public class CoreBsonPack {
* @param logSystem
* @return
*/
public static Bson packBsonByLogSystem(LogSystem logSystem){
public static Bson packBsonByLogSystem(SysLogSystem logSystem){
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson);
@ -36,11 +33,11 @@ public class CoreBsonPack {
return bson;
}
public static Bson packBsonByLogOperate(LogOperate logOperate){
public static Bson packBsonByLogOperate(SysLogOperate logOperate){
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson);
bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false);
bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson);

149
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.base.tool.HqlPack;
import cn.estsh.i3plus.pojo.platform.bean.*;
import org.apache.commons.lang3.StringUtils;
import java.util.Arrays;
@ -16,64 +17,78 @@ import java.util.Arrays;
public class CoreHqlPack {
/**
* In 参数封装
* @param columnName
* @return
*/
public static String packHqlIds(String columnName,String[] params){
StringBuffer result = new StringBuffer();
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(String.join(",",params),columnName,result);
return result.toString();
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static String packHqlIds(String columnName,Long[] params){
StringBuffer result = new StringBuffer();
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(StringUtils.join(params,","),columnName,result);
return result.toString();
}
/**
* 资源查询
* @param sysLocaleResource
* @param localeResource
* @return
*/
public static String packHqlSysLocaleResource(SysLocaleResource sysLocaleResource){
public static String packHqlSysLocaleResource(SysLocaleResource localeResource){
StringBuffer result = new StringBuffer();
//查询日期
// HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(),
// "createDateTime", result, false);
//数字类型封装
HqlPack.getNumEqualPack(sysLocaleResource.getResourceType(),"resourceType",result);
HqlPack.getNumEqualPack(localeResource.getResourceType(),"resourceType",result);
//字符串类型封装
HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result);
HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
//字符串类型封装
HqlPack.getStringLikerPack(sysLocaleResource.getResourceKey(),"resourceKey",result);
HqlPack.getStringLikerPack(localeResource.getResourceKey(),"resourceKey",result);
return result.toString();
}
/**
* 语言
* @param lang
* @param localeLanguage
* @return
*/
public static String packHqlSysLocaleLanguage(SysLocaleLanguage lang) {
public static String packHqlSysLocaleLanguage(SysLocaleLanguage localeLanguage) {
StringBuffer result = new StringBuffer();
//查询日期
// HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(),
// "createDateTime", result, false);
//字符串类型封装
HqlPack.getStringLikerPack(lang.getLanguageCode(),"languageCode",result);
HqlPack.getStringLikerPack(localeLanguage.getLanguageCode(),"languageCode",result);
//字符串类型封装
HqlPack.getStringLikerPack(lang.getLanguageName(),"languageName",result);
HqlPack.getStringLikerPack(localeLanguage.getLanguageName(),"languageName",result);
return result.toString();
}
/**
* In 参数封装
* @param columnName
* @return
*/
public static String packHqlIds(String columnName,String[] params){
StringBuffer result = new StringBuffer();
// 参数数组 [1,2,3] -> "1,2,3"
HqlPack.getInPack(String.join(",",params),columnName,result);
return result.toString();
}
/**
* 岗位复杂查询
* @param position
* @return
*/
public static String packHqlPosition(Position position){
public static String packHqlSysPosition(SysPosition position){
StringBuffer result = new StringBuffer();
// 查询参数封装
@ -89,7 +104,7 @@ public class CoreHqlPack {
* @param organize
* @return
*/
public static String packHqlOrganize(Organize organize){
public static String packHqlSysOrganize(SysOrganize organize){
StringBuffer result = new StringBuffer();
// 查询参数封装
@ -105,7 +120,7 @@ public class CoreHqlPack {
* @param department
* @return
*/
public static String packHqlDepartment(Department department){
public static String packHqlSysDepartment(SysDepartment department){
StringBuffer result = new StringBuffer();
// 查询参数封装
@ -150,36 +165,36 @@ public class CoreHqlPack {
/**
* 系统参数复杂查询
* @param sysConfig
* @param config
* @return
*/
public static String packHqlSysConfig(SysConfig sysConfig) {
public static String packHqlSysConfig(SysConfig config) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(sysConfig.getName(),"name",result);
HqlPack.getStringLikerPack(sysConfig.getConfigCode(),"configCode",result);
HqlPack.getNumEqualPack(sysConfig.getConfigTypeId(),"configTypeId",result);
HqlPack.getStringLikerPack(config.getName(),"name",result);
HqlPack.getStringLikerPack(config.getConfigCode(),"configCode",result);
HqlPack.getNumEqualPack(config.getConfigType(),"configTypeId",result);
return result.toString();
}
/**
* 字典信息复杂查询
* @param sysDictionary
* @param dictionary
* @return
*/
public static String packHqlSysDictionary(SysDictionary sysDictionary) {
public static String packHqlSysDictionary(SysDictionary dictionary) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(sysDictionary.getName(),"name",result);
HqlPack.getStringLikerPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
HqlPack.getStringLikerPack(dictionary.getName(),"name",result);
HqlPack.getStringLikerPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
// 默认查询非顶级字典
if(sysDictionary.getParentId() == null || sysDictionary.getParentId() < 1){
if(dictionary.getParentId() == null || dictionary.getParentId() < 1){
HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(),"parentId",result);
}
HqlPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result);
return result.toString();
}
@ -189,7 +204,7 @@ public class CoreHqlPack {
* @param toolType
* @return
*/
public static String packHqlToolType(ToolType toolType) {
public static String packHqlSysToolType(SysToolType toolType) {
StringBuffer result = new StringBuffer();
// hql拼接
@ -203,15 +218,15 @@ public class CoreHqlPack {
* @param tool
* @return
*/
public static String packHqlTool(Tool tool) {
public static String packHqlSysTool(SysTool tool) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(tool.getName(),"name",result);
HqlPack.getNumEqualPack(tool.getToolTypeId(),"toolTypeId",result);
HqlPack.getNumEqualPack(tool.getToolStatusId(),"toolStatusId",result);
HqlPack.getNumEqualPack(tool.getToolDataTypeId(),"toolDataTypeId",result);
HqlPack.getNumEqualPack(tool.getToolConnTypeId(),"toolConnTypeId",result);
HqlPack.getNumEqualPack(tool.getToolStatus(),"toolStatus",result);
HqlPack.getNumEqualPack(tool.getToolDataType(),"toolDataType",result);
HqlPack.getNumEqualPack(tool.getToolConnType(),"toolConnType",result);
HqlPack.getStringLikerPack(tool.getToolIp(),"toolIp",result);
HqlPack.getNumLikerPack(tool.getToolPort(),"toolPort",result);
@ -220,37 +235,37 @@ public class CoreHqlPack {
/**
* 消息复杂查询
* @param sysMessage
* @param message
* @return
*/
public static String packHqlSysMessage(SysMessage sysMessage){
public static String packHqlSysMessage(SysMessage message){
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(sysMessage.getMessageTitle(),"messageTitle",result);
HqlPack.getStringLikerPack(sysMessage.getMessageContent(),"messageContent",result);
HqlPack.getStringLikerPack(message.getMessageTitle(),"messageTitle",result);
HqlPack.getStringLikerPack(message.getMessageContent(),"messageContent",result);
// HqlPack.getNumLikerPack(sysMessage.getMessageStatusId(),"messageStatusId",result);
// HqlPack.getNumLikerPack(sysMessage.getMessageTypeId(),"messageTypeId",result);
// HqlPack.getNumEqualPack(sysMessage.getMessageRecipientId(),"messageRecipientId",result);
// HqlPack.getNumEqualPack(sysMessage.getMessageSendId(),"messageSendId",result);
HqlPack.timeBuilder(sysMessage.getCreateDatetime(),"createDatetime", result, false,false);
HqlPack.timeBuilder(message.getCreateDatetime(),"createDatetime", result, false,false);
return result.toString();
}
/**
* 文件资源复杂查询
* @param sysFile
* @param file
* @return
*/
public static String packHqlSysFile(SysFile sysFile) {
public static String packHqlSysFile(SysFile file) {
StringBuffer result = new StringBuffer();
// hql拼接
HqlPack.getStringLikerPack(sysFile.getName(),"name",result);
HqlPack.getNumEqualPack(sysFile.getFileTypeId(),"fileTypeId",result);
HqlPack.getStringLikerPack(sysFile.getCreateUser(),"createUser",result);
HqlPack.timeBuilder(sysFile.getCreateDatetime(),"createDatetime",result,false,false);
HqlPack.getStringLikerPack(file.getName(),"name",result);
HqlPack.getNumEqualPack(file.getFileTypeId(),"fileTypeId",result);
HqlPack.getStringLikerPack(file.getCreateUser(),"createUser",result);
HqlPack.timeBuilder(file.getCreateDatetime(),"createDatetime",result,false,false);
return result.toString();
}
@ -260,7 +275,7 @@ public class CoreHqlPack {
* @param taskTimeExpression
* @return
*/
public static String packHqlTaskTimeExpression(TaskTimeExpression taskTimeExpression) {
public static String packHqlSysTaskTimeExpression(SysTaskTimeExpression taskTimeExpression) {
StringBuffer result = new StringBuffer();
// hql拼接
@ -274,7 +289,7 @@ public class CoreHqlPack {
* @param taskTime
* @return
*/
public static String packHqlTaskTime(TaskTime taskTime){
public static String packHqlSysTaskTime(SysTaskTime taskTime){
StringBuffer result = new StringBuffer();
// hql拼接
@ -308,16 +323,16 @@ public class CoreHqlPack {
/**
* 查询字典代码是否重复
* @param sysDictionary
* @param dictionary
* @return
*/
public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){
public static String packHqlSysDictionaryCode(SysDictionary dictionary){
StringBuffer result = new StringBuffer();
// and
HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result);
HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result);
// not
HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result);
HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result);
return result.toString();
}
@ -344,29 +359,29 @@ public class CoreHqlPack {
/**
* 查询语言代码是否重复
* @param sysLocaleLanguage
* @param localeLanguage
* @return
*/
public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage sysLocaleLanguage){
public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage localeLanguage){
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(sysLocaleLanguage.getLanguageCode(),"languageCode",result);
HqlPack.getNumNOEqualPack(sysLocaleLanguage.getId(),"id",result);
HqlPack.getStringEqualPack(localeLanguage.getLanguageCode(),"languageCode",result);
HqlPack.getNumNOEqualPack(localeLanguage.getId(),"id",result);
return result.toString();
}
/**
* 检查系统资源是否重复
* @param sysLocaleResource
* @param localeResource
* @return
*/
public static String packHqlSysLocaleResourceKey(SysLocaleResource sysLocaleResource){
public static String packHqlSysLocaleResourceKey(SysLocaleResource localeResource){
StringBuffer result = new StringBuffer();
HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result);
HqlPack.getStringEqualPack(sysLocaleResource.getResourceKey(),"resourceKey",result);
HqlPack.getNumNOEqualPack(sysLocaleResource.getId(),"id",result);
HqlPack.getStringEqualPack(localeResource.getLanguageCode(),"languageCode",result);
HqlPack.getStringEqualPack(localeResource.getResourceKey(),"resourceKey",result);
HqlPack.getNumNOEqualPack(localeResource.getId(),"id",result);
return result.toString();
}

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java
Unescape Escape View File

@ -47,9 +47,9 @@ public class WmsSnPrint extends BaseBean {
/**
* 状态:0=创建,5=待处理,10=已处理
*/
@Column(name="STATUS")
@Column(name="PRINT_STATUS")
@ApiParam(value = "状态", example = "0")
public Integer status;
public Integer printStatus;
@Column(name="PRINT_TEMPLATE")
@ApiParam("打印模板")

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
Unescape Escape View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.springframework.format.annotation.DateTimeFormat;
import javax.persistence.Column;
import javax.persistence.Entity;
@ -118,6 +119,7 @@ public class WmsStockSn extends BaseBean {
@Column(name = "PDATE")
@ApiParam(value = "打印时间")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date pdate;
/**
* 1=ASN,10=PO,20=SO

4
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -683,7 +683,7 @@ public class WmsHqlPack {
// 打印机
HqlPack.getStringEqualPack(wmsSnPrint.getPrinter(), "printer", result);
// 打印机状态
HqlPack.getNumEqualPack(wmsSnPrint.getStatus(), "status", result);
HqlPack.getNumEqualPack(wmsSnPrint.getPrintStatus(), "printStatus", result);
getStringBuilderPack(wmsSnPrint, result);
@ -823,7 +823,7 @@ public class WmsHqlPack {
public static String packWmsTransSn(String tranNo) {
StringBuffer result = new StringBuffer();
//查询参数封装
HqlPack.getStringEqualPack(tranNo, "tranNo", result);
HqlPack.getStringEqualPack(tranNo, "transNo", result);
HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
return result.toString();
}

Write Preview
Loading…
Cancel
Save