diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 2e108ed..3edc60e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -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; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 806b624..ae79f78 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -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++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index dbbc2af..fdbcad3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -245,7 +245,11 @@ public class BaseRepositoryImpl 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 diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java index 1c59a91..69854e5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SessionUser.java @@ -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; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 1a9aecf..ddaef4e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -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 ="配置代码") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java similarity index 79% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java index c5d0529..6ab6e0e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Department.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDepartment.java @@ -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 childList; + private transient List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 27b1812..2b8ab16 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -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 ="字典值") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java deleted file mode 100644 index dffb211..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEmployee.java +++ /dev/null @@ -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; -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java similarity index 96% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java index 35f6401..626eef0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Enterprise.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterprise.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java similarity index 92% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java index 8fbb8bd..46d607e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/EnterpriseConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysEnterpriseConfig.java @@ -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 ="配置父节点") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java index 24bd84e..d0d45c3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysException.java @@ -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 ="异常类名") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java similarity index 91% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java index dd43ba9..dcfe3bd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/FactoryStore.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFactoryStore.java @@ -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("仓库代码") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java index 00ed6cd..bbd57cd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysFile.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index f5a576f..a9ec7bd 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -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; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java similarity index 51% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java index bf70aee..77ea17d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogOperate.java @@ -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; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java similarity index 95% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java index cd3d04b..bd6783d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogSystem.java @@ -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") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java similarity index 81% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java index c1856f7..b2b572c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogUserLogin.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java @@ -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") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java index d9e3bb6..23fa593 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 85f9b40..00aa85b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java deleted file mode 100644 index e692264..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethod.java +++ /dev/null @@ -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; - } - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java deleted file mode 100644 index 73b4731..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMethodRole.java +++ /dev/null @@ -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; - } - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java similarity index 77% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java index c758df2..0f51341 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Organize.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrganize.java @@ -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 childList; + private transient List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java similarity index 81% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java index 09d82c0..dd5e424 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Position.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysPosition.java @@ -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 childList; + private transient List childList; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefExpressionTrigger.java similarity index 82% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefExpressionTrigger.java index bf474b6..67b3fab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefExpressionTrigger.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefExpressionTrigger.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java similarity index 65% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java index 0c901bb..1851937 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefRoleMenu.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefRoleMenu.java @@ -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; } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java similarity index 74% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java index 73d4277..fd618e5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserDepartment.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java similarity index 79% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserMessage.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java index 45f3f45..69e272d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserMessage.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java similarity index 72% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java index 7b9eb74..b323292 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserPosition.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserPosition.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java similarity index 74% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java index 1e2003b..f28536b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/RefUserRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserRole.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java index 2df17b4..9a8948e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRole.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTime.java similarity index 85% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTime.java index b771cdf..928e790 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTime.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTime.java @@ -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 ="任务包名") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java similarity index 92% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java index c354c91..7bdcc4d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeExpression.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeExpression.java @@ -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 ="名称") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java similarity index 73% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java index 838defe..bf5520e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TaskTimeRecording.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java @@ -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 ="任务开始时间") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java similarity index 78% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java index 0801ab5..92badd8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/Tool.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTool.java @@ -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 ="操作内容") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java similarity index 91% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java index 72b0017..bd8eeb0 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/ToolType.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysToolType.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index aa8244a..4049c53 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -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; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 3421f7f..969201a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -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 departmentList; + private transient List departmentList; @ApiParam(value ="用户所有岗位信息") - private transient List positionList; + private transient List 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 ="用户详细信息") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java deleted file mode 100644 index ad3438c..0000000 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserRole.java +++ /dev/null @@ -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; - } - } -} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DepartmentRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDepartmentRepository.java similarity index 63% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DepartmentRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDepartmentRepository.java index 5d97d43..6a8a4e4 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DepartmentRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysDepartmentRepository.java @@ -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 { +public interface SysDepartmentRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseConfigRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseConfigRepository.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseConfigRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseConfigRepository.java index 83900c8..5a2a43d 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseConfigRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseConfigRepository.java @@ -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 { +public interface SysEnterpriseConfigRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseRepository.java index 9c78341..11c6fb3 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/EnterpriseRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysEnterpriseRepository.java @@ -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 { +public interface SysEnterpriseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogUserLoginRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserLoginRepository.java similarity index 63% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogUserLoginRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserLoginRepository.java index 51e9e8e..92a04e1 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogUserLoginRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysLogUserLoginRepository.java @@ -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 { +public interface SysLogUserLoginRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/OrganizeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrganizeRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/OrganizeRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrganizeRepository.java index 384fe63..98a81e6 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/OrganizeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysOrganizeRepository.java @@ -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 { +public interface SysOrganizeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/PositionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPositionRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/PositionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPositionRepository.java index be99be8..42d66da 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/PositionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysPositionRepository.java @@ -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 { +public interface SysPositionRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java similarity index 58% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java index d16dac6..ac0c409 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefExpressionTriggerRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefExpressionTriggerRepository.java @@ -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 { +public interface SysRefExpressionTriggerRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefRoleMenuRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefRoleMenuRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefRoleMenuRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefRoleMenuRepository.java index 2f7a895..fd23e3f 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefRoleMenuRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefRoleMenuRepository.java @@ -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 { +public interface SysRefRoleMenuRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserDepartmentRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserDepartmentRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java index 05e8d77..836ed10 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserDepartmentRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserDepartmentRepository.java @@ -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 { +public interface SysRefUserDepartmentRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserMessageRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserMessageRepository.java similarity index 60% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserMessageRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserMessageRepository.java index e35acd8..3e644fc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserMessageRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserMessageRepository.java @@ -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 { +public interface SysRefUserMessageRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserPositionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserPositionRepository.java similarity index 62% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserPositionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserPositionRepository.java index 01a988a..fcb52f9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserPositionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserPositionRepository.java @@ -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 { +public interface SysRefUserPositionRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserRoleRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserRoleRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserRoleRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserRoleRepository.java index 78c455a..106302e 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/RefUserRoleRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysRefUserRoleRepository.java @@ -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 { +public interface SysRefUserRoleRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeExpressionRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeExpressionRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java index 2717a48..f3066f9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeExpressionRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeExpressionRepository.java @@ -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 { +public interface SysTaskTimeExpressionRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRecordingRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java similarity index 61% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRecordingRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java index 45fe108..67c93ae 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRecordingRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java @@ -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 { +public interface SysTaskTimeRecordingRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java index 36fcbb8..15c9ee8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/TaskTimeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRepository.java @@ -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 { +public interface SysTaskTimeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolRepository.java similarity index 67% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolRepository.java index 8cedabe..97a4648 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolRepository.java @@ -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 { +public interface SysToolRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolTypeRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java similarity index 64% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolTypeRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java index 27624b2..f74a350 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/ToolTypeRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysToolTypeRepository.java @@ -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 { +public interface SysToolTypeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java similarity index 65% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java index 9d4ff80..6fc7766 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogOperateRepository.java @@ -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 { +public interface SysLogOperateRepository extends BaseMongoRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java similarity index 50% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java index fccdc6c..dab92ce 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/SysLogSystemRepository.java @@ -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 { +public interface SysLogSystemRepository extends BaseMongoRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java index 0eb049a..a9f2c60 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -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); diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 26f3b65..cfb2876 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -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(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java index 61d3b3e..7e6d4ab 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnPrint.java @@ -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("打印模板") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index 01d0144..2ab56fe 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -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 diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8c3fef6..fbf1290 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -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(); }