From bca93691baf09fc82b1238fbbddea22bc435682e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 15:35:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsListElementModel.java | 33 ++++------------------ 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index a286a2e..2c8f6f2 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -1,10 +1,14 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsListElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import javax.persistence.Column; +import java.util.List; + /** * @Description : WMS列表菜单model * @Reference : @@ -16,33 +20,6 @@ import lombok.Data; @Api("WMS列表菜单model") public class WmsListElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam("序列号:字段标题排序使用默认0（不排序）") - private Integer seq; - - @ApiParam(value = "是否必选:默认1-必选，2-非必选") - private Integer isRequire; - - @ApiParam(value = "宽度") - private Double width; - - @ApiParam(value = "排序规则:默认0-不排序，1-升序2-降序") - private Integer sort; - - @ApiParam(value = "是否加粗:默认1-加粗，2-非加粗") - private Integer isWider; - - @ApiParam(value = "是否勾选:默认1-勾选，2-非勾选") - private Integer isSelect; - - @ApiParam(value = "表单字段默认值") - private String defaultValue; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -52,4 +29,6 @@ public class WmsListElementModel extends BaseBean { @ApiParam(value = "是否默认配置") private Integer isDefault; + List wmsListElementList; + } From e1386275d0f9d71396f585ab962bc3f2c8e81939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 15:49:57 +0800 Subject: [PATCH 2/8] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsFieldInfo.java | 6 +++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsListElement.java | 6 +++++- .../i3plus/pojo/wms/bean/dynamic/WmsListElementFunction.java | 7 ++++++- .../cn/estsh/i3plus/pojo/wms/bean/dynamic/WmsSearchElement.java | 5 ++++- .../i3plus/pojo/wms/bean/dynamic/WmsSearchElementFunction.java | 9 ++++++++- 5 files changed, 28 insertions(+), 5 deletions(-) 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 index 7ef1220..b1f3e68 100644 --- 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 @@ -9,6 +9,7 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -20,7 +21,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_FIELDINFO") +@Table(name="WMS_FIELDINFO", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "ENTITY_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) 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 index 09109a7..d654c64 100644 --- 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,10 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT") +@Table(name="WMS_LISTELEMENT", indexes = { + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) 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 index 18ff672..dc94f0a 100644 --- 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,11 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_LISTELEMENT_FUNCTION") +@Table(name="WMS_LISTELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "ELEMENT_ID"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) 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 index cdae331..de0aaf6 100644 --- 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,9 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT") +@Table(name="WMS_SEARCHELEMENT", indexes = { + @Index(columnList = "FIELD_NAME") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) 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 index d10ef27..54f31aa 100644 --- 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; /** @@ -21,7 +22,13 @@ import javax.persistence.Table; **/ @Data @Entity -@Table(name="WMS_SEARCHELEMENT_FUNCTION") +@Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { + @Index(columnList = "FUNCTION_ID"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "SEARCH_ELEMENT_ID"), + @Index(columnList = "IS_SHARE"), + @Index(columnList = "USER_CODE") +}) @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) From d05fd542b37d0b24a7ec595ffd03e9ba3f01da4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 8 Jan 2020 16:29:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?2020-01-08=E6=B7=BB=E5=8A=A0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=8F=9C=E5=8D=95=E4=B8=8E=E5=AF=B9=E5=BA=94=E5=92=8C?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java index 2c8f6f2..0a11f26 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsListElementModel.java @@ -6,7 +6,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.util.List; /** From c14d6c6916ea260c967fb4a5baad4fbee39f2b7a Mon Sep 17 00:00:00 2001 From: gcj Date: Wed, 8 Jan 2020 17:31:45 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E3=80=90=E5=AE=81=E5=BE=B7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E6=B8=85=E5=8D=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 35 ++++++++ .../estsh/i3plus/pojo/wms/bean/WmsPushConfig.java | 92 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java | 52 ++++++++++++ .../pojo/wms/modelbean/MailMessageModel.java | 15 ++++ .../pojo/wms/modelbean/PushMessageModel.java | 25 ++++++ .../wms/repository/WmsPushConfigRepository.java | 19 +++++ .../pojo/wms/repository/WmsPushLogRepository.java | 18 +++++ 7 files changed, 256 insertions(+) create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java 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 665cbcb..33d06b5 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 @@ -4793,4 +4793,39 @@ public class WmsEnumUtil { } + /** + * 推送类型 + * 默认为 10 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PUSH_TYPE { + EMAIL(10, "邮件"), SMS(20, "短信"); + + private int value; + private String description; + + PUSH_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } \ No newline at end of file diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java new file mode 100644 index 0000000..374abd7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushConfig.java @@ -0,0 +1,92 @@ +package cn.estsh.i3plus.pojo.wms.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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 推送信息配置 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_CONFIG") +@Api("推送配置") +public class WmsPushConfig extends BaseBean{ + + private static final long serialVersionUID = 2701710669030092153L; + @ApiParam("推送名称") + @Column(name = "PUSH_NAME") + private String pushName; + + @ApiParam("规则类型") + @Column(name = "QUARTZ_CRON") + private String quartzCron; + + @ApiParam("末次执行时间") + @Column(name = "LAST_EXE_TIME") + private String lastExeTime; + + @ApiParam("下次执行时间") + @Column(name = "NEXT_EXE_TIME") + private String nextExeTime; + + @ApiParam("序号") + @Column(name = "SERIAL_NUMBER") + private Integer serialNumber; + + @ApiParam("查询Hql") + @Column(name = "HQL_STR") + private String hqlStr; + + @ApiParam("查询Sql") + @Column(name = "SQL_STR") + private String sqlStr; + + @ApiParam("脚本编号") + @Column(name = "SCRIPT_NO") + private String scriptNo; + + @ApiParam("标题模板") + @Column(name = "TITLE_TEMPLATE") + private String titleTemplate; + + @ApiParam("消息体模板") + @Column(name = "CONTENT_TEMPLATE") + private String contentTemplate; + + @ApiParam("推送类型") + @Column(name = "PUSH_TYPE") + private Integer pushType; + + @ApiParam("描述") + @Column(name = "REMARK") + private String remark; + + @ApiParam("推送地址") + @Column(name ="PATH_URL") + private String pathUrl; + + @ApiParam("头标签") + @Column(name = "TITLE_LABEL") + private String titleLabel; + + @ApiParam("内容标签") + @Column(name = "CONTENT_LABEL") + private String contentLabel; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java new file mode 100644 index 0000000..6a57625 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPushLog.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.wms.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 org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : 推送信息配置 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 15:58 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "WMS_PUSH_LOG") +@Api("推送日志") +public class WmsPushLog extends BaseBean{ + + private static final long serialVersionUID = -1708833666516164845L; + @Column(name = "EXE_HQL") + @ApiParam("执行Hql") + private String exeHql; + + @Column(name = "PUSH_TITLE") + @ApiParam("推送标题") + private String pushTitle; + + @Column(name = "PUSH_CONTENT") + @ApiParam("推送内容") + private String pushContent; + + @Column(name = "PUSH_TYPE") + @ApiParam("推送类型") + private String pushType; + + @Column(name = "PUSH_RESULT") + @ApiParam("推送结果") + private String pushResult; + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java new file mode 100644 index 0000000..6667a49 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/MailMessageModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.Map; + +@Data +public class MailMessageModel extends PushMessageModel { + + + //附加，value 文件的绝对地址/动态模板数据 + private Map attachment; + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java new file mode 100644 index 0000000..1e2ff26 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/PushMessageModel.java @@ -0,0 +1,25 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class PushMessageModel { + + + //标题 + public String title; + //内容 + public String content; + + //推送类型 + public String pushType; + + //推送地址 + public String pathUrl; + + //推送数据 + List> dataList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java new file mode 100644 index 0000000..65de6a6 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushConfigRepository.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushConfig; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志配置信息 + * @Reference : + * @Author : gcj + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushConfigRepository extends BaseRepository { + + +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java new file mode 100644 index 0000000..209b9a7 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsPushLogRepository.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.wms.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import cn.estsh.i3plus.pojo.wms.bean.WmsPushLog; +import org.springframework.stereotype.Repository; + +/** + * @Description : 推送日志保存对象 + * @Reference : + * @Author : silliter.yuan + * @CreateDate : 2020-01-06 9:47 + * @Modify: + **/ +@Repository +public interface WmsPushLogRepository extends BaseRepository { + +} From daf3365ce3a222c4b5330e76861bb4d1d8373781 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 18:22:00 +0800 Subject: [PATCH 5/8] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/model/wms/WmsSearchElementModel.java | 22 +++++----------------- .../pojo/wms/bean/dynamic/WmsSearchElement.java | 15 +++++++++++++-- .../wms/bean/dynamic/WmsSearchElementFunction.java | 6 +----- 3 files changed, 19 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java index 9ca8e79..0056ba7 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsSearchElementModel.java @@ -1,10 +1,13 @@ package cn.estsh.i3plus.pojo.model.wms; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsSearchElement; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; +import java.util.List; + /** * @Description : WMS列表搜索model * @Reference : @@ -16,21 +19,6 @@ import lombok.Data; @Api("WMS列表搜索model") public class WmsSearchElementModel extends BaseBean { - @ApiParam("字段名称") - private String fieldName; - - @ApiParam("标题名称") - private String titleName; - - @ApiParam(value = "条件表达式:>,<,>=等") - private String conditionExpre; - - @ApiParam(value = "检索值") - private String value; - - @ApiParam(value = "条件连接符:and/or") - private String conditionConnector; - @ApiParam(value = "功能菜单ID") private Long functionId; @@ -46,6 +34,6 @@ public class WmsSearchElementModel extends BaseBean { @ApiParam(value = "是否共享") private Integer isShare; - @ApiParam(value = "搜索名称") - private String searchName; + @ApiParam(value = "Wms查询元素列表") + private List searchElementList; } 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 index de0aaf6..8ffe833 100644 --- 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 @@ -16,14 +16,16 @@ import javax.persistence.Table; /** * @Description : WMS搜索元素表 * @Reference : - * @Author : sjc + * @Author : siliter.yuan * @CreateDate : 2020-01-07 09:06 * @Modify: **/ @Data @Entity @Table(name="WMS_SEARCHELEMENT", indexes = { - @Index(columnList = "FIELD_NAME") + @Index(columnList = "FIELD_NAME"), + @Index(columnList = "SEARCH_NAME"), + @Index(columnList = "USER_CODE") }) @DynamicInsert @DynamicUpdate @@ -32,6 +34,7 @@ import javax.persistence.Table; public class WmsSearchElement extends BaseBean { private static final long serialVersionUID = 3903166651913139062L; + @Column(name = "FIELD_NAME") @ApiParam(value = "字段名称") private String fieldName; @@ -51,4 +54,12 @@ public class WmsSearchElement extends BaseBean { @Column(name = "CONDITION_CONNECTOR") @ApiParam(value = "条件连接符:and/or") private String conditionConnector; + + @Column(name = "SEARCH_NAME") + @ApiParam(value = "搜索名称") + private String searchName; + + @Column(name = "USER_CODE") + @ApiParam(value = "用户编号") + private String userCode; } 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 index 54f31aa..43cbb23 100644 --- 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 @@ -24,7 +24,6 @@ import javax.persistence.Table; @Entity @Table(name="WMS_SEARCHELEMENT_FUNCTION", indexes = { @Index(columnList = "FUNCTION_ID"), - @Index(columnList = "SEARCH_NAME"), @Index(columnList = "SEARCH_ELEMENT_ID"), @Index(columnList = "IS_SHARE"), @Index(columnList = "USER_CODE") @@ -36,6 +35,7 @@ import javax.persistence.Table; public class WmsSearchElementFunction extends BaseBean { private static final long serialVersionUID = 3903166651913139063L; + @Column(name = "FUNCTION_ID") @ApiParam(value = "功能菜单ID") private Long functionId; @@ -44,10 +44,6 @@ public class WmsSearchElementFunction extends BaseBean { @ApiParam(value = "组名称") private String groupName; - @Column(name = "SEARCH_NAME") - @ApiParam(value = "搜索名称") - private String searchName; - @Column(name = "SEARCH_ELEMENT_ID") @ApiParam(value = "搜索元素ID") private Long searchElementId; From 42bbb852c4451475cfe482e3fa4832046e8aa545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E6=B4=A5=E5=93=B2?= Date: Wed, 8 Jan 2020 20:02:45 +0800 Subject: [PATCH 6/8] =?UTF-8?q?Wms=E5=88=9D=E5=A7=8B=E5=8C=96=E6=89=AB?= =?UTF-8?q?=E6=8F=8F=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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 55724ff..65c25de 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; +import cn.estsh.i3plus.pojo.wms.bean.dynamic.WmsFieldInfo; import cn.estsh.i3plus.pojo.wms.dbinterface.WmsInterfaceDataMapper; import cn.estsh.i3plus.pojo.wms.engine.rule.EngineRulePersistence; import cn.estsh.i3plus.pojo.wms.engine.script.EngineScriptPersistence; @@ -2713,4 +2714,17 @@ public class WmsHqlPack { return result; } + /** + * WMS实体字段信息分页查询条件 + * + * @param wmsFieldInfo + * @return + */ + public static DdlPackBean packHqlWmsFieldInfo(WmsFieldInfo wmsFieldInfo) { + DdlPackBean result = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getFieldName(), "fieldName", result); + DdlPreparedPack.getStringEqualPack(wmsFieldInfo.getEntityName(), "entityName", result); + getStringBuilderPack(wmsFieldInfo, result); + return result; + } } From 0a70a42336fb0310e622f2ecee5ae885af4c5513 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 8 Jan 2020 20:34:46 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1381=20?= =?UTF-8?q?=E5=85=BC=E5=AE=B9Sql=20server=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 6 +++++- .../i3plus/pojo/mes/model/MesEquTaskStandardModel.java | 9 ++++++++- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 15 --------------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index b8e6909..e632a49 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -58,6 +58,9 @@ public class MesEquTaskPlanModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimePlan; + @ApiParam("作业类型名称") private String taskTypeName; @@ -69,7 +72,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String memo, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimePlan) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -87,5 +90,6 @@ public class MesEquTaskPlanModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimePlan = modifyDatetimePlan; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java index ca5f0ce..732f977 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskStandardModel.java @@ -55,6 +55,9 @@ public class MesEquTaskStandardModel implements Serializable { @ApiParam("修改日期") public String modifyDatetime; + @ApiParam("修改日期") + public String modifyDatetimeStandard; + @ApiParam("作业类型") private String taskTypeName; @@ -66,7 +69,10 @@ public class MesEquTaskStandardModel implements Serializable { } - public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskStandardModel(Long id, String equipmentCode, String equipmentName, Integer taskType, String actionItem, + String actionStandard, String actionGuide, String workCenterCode, String equipmentCategory, + String organizeCode, Integer isValid, Integer isDeleted, String createUser, + String createDatetime, String modifyUser, String modifyDatetime, String modifyDatetimeStandard) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -83,5 +89,6 @@ public class MesEquTaskStandardModel implements Serializable { this.createDatetime = createDatetime; this.modifyUser = modifyUser; this.modifyDatetime = modifyDatetime; + this.modifyDatetimeStandard = modifyDatetimeStandard; } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 93083c2..7df0f79 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -102,10 +102,6 @@ public class MesHqlPack { mesPlanOrder.getCreateDateTimeEnd(), "createDatetime", packBean, true); } - - // 排序 - DdlPreparedPack.getOrderDefault(mesPlanOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPlanOrder.getOrderByParam()}, packBean); return packBean; } @@ -141,8 +137,6 @@ public class MesHqlPack { } else { DdlPreparedPack.getStringNoEqualPack("WXJ", "produceCategoryCode", packBean); } - DdlPreparedPack.getOrderDefault(mesPart); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean); return packBean; } @@ -205,7 +199,6 @@ public class MesHqlPack { "createDatetime", packBean, true); } DdlPreparedPack.getOrderDefault(mesWorkOrder); - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean); return packBean; } @@ -243,8 +236,6 @@ public class MesHqlPack { "createDatetime", packBean, true); // DdlPreparedPack.getOrderDefault(mesQueueOrder); - // 按照队列序列号倒序 - DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{"seq"}, packBean); return packBean; } @@ -321,7 +312,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesRoute, organizeCode); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringLikerPack(mesRoute.getRouteName(), "routeName", packBean); - packBean.setOrderByStr(mesRoute.orderBy()); return packBean; } @@ -337,7 +327,6 @@ public class MesHqlPack { DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); - packBean.setOrderByStr(mesProdRouteCfg.orderBy()); return packBean; } @@ -1163,8 +1152,6 @@ public class MesHqlPack { if (null != numberRule.getIsCycle()) { DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean); } - - packBean.setOrderByStr(numberRule.orderBy()); return packBean; } @@ -1183,7 +1170,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPcnTask.getTaskName())) { DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); } - packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } @@ -1230,7 +1216,6 @@ public class MesHqlPack { if (!StringUtils.isEmpty(buttonStatus.getButtonCode())) { DdlPreparedPack.getStringLikerPack(buttonStatus.getButtonCode(), "buttonCode", packBean); } - packBean.setOrderByStr(buttonStatus.orderBy()); return packBean; } From 031d57e0816f7695719136c670abb7b17b3c82a8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 9 Jan 2020 09:30:06 +0800 Subject: [PATCH 8/8] JIS --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 2 ++ .../java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 09b331d..6635e25 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -37,6 +38,7 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; + @Lob @Column(name = "RULE") @ApiParam("规则") private String rule; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index c838c4d..19d1a22 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -102,6 +102,7 @@ public class MesEquipmentModel implements Serializable { } + //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { this.id = id; this.equipmentCode = equipmentCode; @@ -111,6 +112,8 @@ public class MesEquipmentModel implements Serializable { this.equipmentCategory = equipmentCategory; } + //根据生产线，工位获取设备集合 findMesEquipmentList + //获取设备分页数据-组织模型 queryMesEquipmentByPagerOrg public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; @@ -122,6 +125,7 @@ public class MesEquipmentModel implements Serializable { this.areaCode = areaCode; } + //根据条件查询设备所有有效数据-组织模型下拉框及联 queryMesEquipmentList public MesEquipmentModel(Long id, String equipmentNameAndworkCellName, String equipmentCode, String equipmentName, Integer status, String areaCode, String workCenterCode, String workCellCode) { this.id = id; this.equipmentNameAndworkCellName = equipmentNameAndworkCellName; @@ -134,13 +138,13 @@ public class MesEquipmentModel implements Serializable { } - public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + //获取设备分页数据 queryMesEquipmentByPager + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String areaCode, Integer equipmentType, String equipmentCategory, String memo, String equipmentModel, String equipmentSpec, String equipmentMaker, String releaseDate, String receiveDate, String enableDate, Integer connectType, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; this.status = status; this.workCenterCode = workCenterCode; - this.workCellCode = workCellCode; this.areaCode = areaCode; this.equipmentType = equipmentType; this.equipmentCategory = equipmentCategory;