From b939ce66253140c7becc3b6af73e503c6f54f426 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:10:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 51 +++++++++++++++ .../pojo/wms/bean/dynamic/WmsListElement.java | 75 ++++++++++++++++++++++ .../wms/bean/dynamic/WmsListElementFunction.java | 47 ++++++++++++++ .../pojo/wms/bean/dynamic/WmsSearchElement.java | 51 +++++++++++++++ .../wms/bean/dynamic/WmsSearchElementFunction.java | 55 ++++++++++++++++ 5 files changed, 279 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java new file mode 100644 index 0000000..718dd49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_FIELDINFO") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS字段信息表",description = "WMS字段信息表") +public class WmsFieldInfo extends BaseBean { + + private static final long serialVersionUID = 3903166651913139064L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "FIELD_DESC") + @ApiParam(value = "字段描述") + private String fieldDesc; + + @Column(name = "FIELD_TYPE") + @ApiParam(value = "字段类型") + private String fieldType; + + @Column(name = "ENTITY_NAME") + @ApiParam(value = "实体名称") + private String entityName; + + @Column(name = "ENTITY_DESC") + @ApiParam(value = "实体描述") + private String entityDesc; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java new file mode 100644 index 0000000..bd3d125 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素表",description = "WMS列表元素表") +public class WmsListElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139060L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "SEQ") + @ApiParam(value = "序列号:字段标题排序使用默认0（不排序）") + private Integer seq; + + @Column(name = "IS_REQUIRE") + @ApiParam(value = "是否必选:默认1-必选，2-非必选") + private Integer isRequire; + + @Column(name = "WIDTH", columnDefinition = "decimal(2,5)") + @ApiParam(value = "宽度", example = "0") + private Double width; + + public Double getWidth() { + return this.width == null ? 0 : this.width.doubleValue(); + } + + @Column(name = "SORT") + @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") + private Integer sort; + + @Column(name = "IS_WIDER") + @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") + private Integer isWider; + + @Column(name = "IS_SELECT") + @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") + private Integer isSelect; + + @Column(name = "ISSHOW") + @ApiParam(value = "是否表单字段展示:默认1-显示，2-隐藏") + private Integer isShow; + + @Column(name = "DEFAULT_VALUE") + @ApiParam(value = "表单字段默认值") + private String defaultValue; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java new file mode 100644 index 0000000..18ff672 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_LISTELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS列表元素菜单关系表",description = "WMS列表元素菜单关系表") +public class WmsListElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139061L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "ELEMENT_ID") + @ApiParam(value = "元素ID") + private Long elementId; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_DEFAULT") + @ApiParam(value = "是否默认配置") + private Integer isDefault; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java new file mode 100644 index 0000000..cdae331 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素表",description = "WMS搜索元素表") +public class WmsSearchElement extends BaseBean { + + private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") + @ApiParam(value = "字段名称") + private String fieldName; + + @Column(name = "TITLE_NAME") + @ApiParam(value = "标题名称") + private String titleName; + + @Column(name = "CONDITION_EXPRE") + @ApiParam(value = "条件表达式:>,<,>=等") + private String conditionExpre; + + @Column(name = "VALUE") + @ApiParam(value = "检索值") + private String value; + + @Column(name = "CONDITION_CONNECTOR") + @ApiParam(value = "条件连接符:and/or") + private String conditionConnector; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java new file mode 100644 index 0000000..4e0a3fd --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java @@ -0,0 +1,55 @@ +package cn.estsh.i3plus.pojo.wms.bean.dynamic; + +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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 09:06 + * @Modify: + **/ +@Data +@Entity +@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api(value="WMS搜索元素菜单关系表",description = "WMS搜索元素菜单关系表") +public class WmsSearchElementFunction extends BaseBean { + + private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") + @ApiParam(value = "功能菜单ID") + private Long functionId; + + @Column(name = "GROUP_NAME") + @ApiParam(value = "组名称") + private String groupName; + + @Column(name = "SEARCH_ELEMENT_ID") + @ApiParam(value = "搜索元素ID") + private Long searchElementId; + + @Column(name = "GROUP_CONNECTOR") + @ApiParam(value = "组条件连接符") + private String groupConnector; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; + + @Column(name = "IS_SHAER") + @ApiParam(value = "是否共享") + private Integer isShaer; +} From b2edab4ef403dc6e7ec251dc4a69109f3ae1f5f6 Mon Sep 17 00:00:00 2001 From: e-jiawentao1 Date: Tue, 7 Jan 2020 11:38:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2020-01-07=E5=88=9B=E5=BB=BA=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2=E4=B8=8E=E8=A1=A8=E5=8D=95dao?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/repository/WmsFieldInfoRepository.java | 16 ++++++++++++++++ .../wms/repository/WmsListElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsListElementRepository.java | 16 ++++++++++++++++ .../repository/WmsSearchElementFunctionRepository.java | 16 ++++++++++++++++ .../pojo/wms/repository/WmsSearchElementRepository.java | 16 ++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java new file mode 100644 index 0000000..f1e59d0 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsFieldInfoRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS字段信息表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsFieldInfoRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java new file mode 100644 index 0000000..5b724e6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java new file mode 100644 index 0000000..9433e7d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsListElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS列表元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsListElementRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java new file mode 100644 index 0000000..1746d7e --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementFunctionRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElementFunction; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素菜单关系表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementFunctionRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java new file mode 100644 index 0000000..028586d --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsSearchElementRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; +import org.springframework.stereotype.Repository; + +/** + * @Description : WMS搜索元素表 + * @Reference : + * @Author : sjc + * @CreateDate : 2020-01-07 11:30 + * @Modify: + **/ +@Repository +public interface WmsSearchElementRepository extends BaseRepository { +}