From 12a2a27b18caee4a678812d3b01bc8b96bf0b695 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Mon, 26 Aug 2019 10:28:01 +0800 Subject: [PATCH 1/6] =?UTF-8?q?mes=EF=BC=8C=20pcn=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: crish <570360737@qq.com> --- .../i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java | 11 +++-- .../pojo/mes/pcn/bean/MesLabelTemplateParam.java | 6 +-- .../MesLabelTemplateParamRepository.java | 13 ++---- .../pcn/repository/MesLabelTemplateRepository.java | 13 ++---- .../i3plus/pojo/mes/bean/MesLabelTemplate.java | 52 +++++++++++++++++++++ .../pojo/mes/bean/MesLabelTemplateParam.java | 54 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 50 ++++++++++++++++++++ .../i3plus/pojo/mes/model/MesPcnStatusModel.java | 15 ++++++ .../MesLabelTemplateParamRepository.java | 14 ++++++ .../mes/repository/MesLabelTemplateRepository.java | 14 ++++++ .../repository/MesPcnSyncErrorLogRepository.java | 16 +++++++ .../model/platform/LabelTemplateAndParamModel.java | 17 +++++++ .../pojo/platform/bean/SysLabelTemplate.java | 5 ++ 13 files changed, 258 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java index 901111a..1f19e69 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplate.java @@ -9,12 +9,13 @@ import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import javax.persistence.*; +import java.util.List; /** * @Description : 打印模板 * @Reference : - * @Author : siliter - * @CreateDate : 2019-03-18 11:00 + * @Author : crish + * @CreateDate : 2019-08-18 11:00 * @Modify: **/ @Data @@ -22,7 +23,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="Mes_LABEL_TEMPLATE") +@Table(name="MES_LABEL_TEMPLATE") @Api(value="打印模板",description = "打印模板") public class MesLabelTemplate extends BaseBean { @@ -44,4 +45,8 @@ public class MesLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") @Transient private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java index bb87217..c93ff80 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesLabelTemplateParam.java @@ -15,8 +15,8 @@ import javax.persistence.*; /** * @Description : 打印模板参数 * @Reference : - * @Author : siliter - * @CreateDate : 2019-03-18 11:00 + * @Author : crish + * @CreateDate : 2019-08-18 11:00 * @Modify: **/ @Data @@ -24,7 +24,7 @@ import javax.persistence.*; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="Mes_LABEL_TEMPLATE_PARAM") +@Table(name="MES_LABEL_TEMPLATE_PARAM") @Api(value="打印模板参数",description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean { diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java index 6236031..b74b509 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateParamRepository.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplateParam; -import org.springframework.stereotype.Repository; /** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ -@Repository public interface MesLabelTemplateParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java index 8b71fac..1895f29 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesLabelTemplateRepository.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.mes.pcn.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.mes.pcn.bean.MesArea; import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate; -import org.springframework.stereotype.Repository; /** - * @Description : - * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-02 - * @Modify: + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : **/ -@Repository public interface MesLabelTemplateRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java new file mode 100644 index 0000000..e0db91a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -0,0 +1,52 @@ +package cn.estsh.i3plus.pojo.mes.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.*; +import java.util.List; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_LABEL_TEMPLATE") +@Api(value="打印模板",description = "打印模板") +public class MesLabelTemplate extends BaseBean { + + private static final long serialVersionUID = 5371856566557305323L; + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_NAME") + @ApiParam(value ="模板名称") + private String templateName; + + @Lob + @Column(name="TEMPLATE_CONTENT") + @ApiParam(value ="模板内容") + private String templateContent; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数拼接") + @Transient + private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java new file mode 100644 index 0000000..592450e --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -0,0 +1,54 @@ +package cn.estsh.i3plus.pojo.mes.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; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.*; + +/** + * @Description : 打印模板参数 + * @Reference : + * @Author : crish + * @CreateDate : 2019-08-18 11:00 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_LABEL_TEMPLATE_PARAM") +@Api(value="打印模板参数",description = "打印模板参数") +public class MesLabelTemplateParam extends BaseBean { + + private static final long serialVersionUID = 6476163540527157643L; + @Column(name="TEMPLATE_ID") + @ApiParam(value ="模板ID" , access ="模板ID" ,example = "-1") + @JsonSerialize(using = ToStringSerializer.class) + private Long templateId; + + @Column(name="TEMPLATE_CODE") + @ApiParam(value ="模板代码") + private String templateCode; + + @Column(name="TEMPLATE_PARAM") + @ApiParam(value ="模板参数") + private String templateParam; + + @Lob + @Column(name="TEMPLATE_PARAM_TEXT") + @ApiParam(value ="模板参数描述") + private String templateParamText; + + // 参数拼接，多参数都好分隔，后台在做处理 + @ApiParam(value ="模板参数值") + @Transient + private String templateParamValue; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java new file mode 100644 index 0000000..f17d4ad --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -0,0 +1,50 @@ +package cn.estsh.i3plus.pojo.mes.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: crish + * @CreateDate:2019-08-23-17:20 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_SYNC_ERRORLOG") +@Api("MES_PCN同步异常日志") +public class MesPcnSyncErrorLog extends BaseBean { + @Column(name="PCN_CODE") + @ApiParam("PCN代码") + private String pcnCode; + + @Column(name="OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name="OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name="ERROR_SPOT") + @ApiParam("异常位置") + private String errorSpot; + + @Column(name="ERROR_CONTENT") + @ApiParam("异常内容") + private String errorContent; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java new file mode 100644 index 0000000..6e605b9 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPcnStatusModel.java @@ -0,0 +1,15 @@ +package cn.estsh.i3plus.pojo.mes.model; + +/** + * @Description: PCN连接状态统计Model + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-07-14:56 + * @Modify: + **/ +public class MesPcnStatusModel { + + private int healthNodeNumber; + + private int illNodeNumber; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java new file mode 100644 index 0000000..132c99d --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateParamRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplateParam; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateParamRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java new file mode 100644 index 0000000..55f667a --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLabelTemplateRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesLabelTemplate; + +/** + * @Description : 打印模板 + * @Reference : + * @Author : crish + * @Date : 2019-08-18 12:03:01.024 + * @Modify : + **/ +public interface MesLabelTemplateRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java new file mode 100644 index 0000000..c87f581 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnSyncErrorLogRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnSyncErrorLog; +import org.springframework.stereotype.Repository; + +/** + * @Description: + * @Reference: + * @Author: crish + * @CreateDate:2019-08-23-17:13 + * @Modify: + **/ +@Repository +public interface MesPcnSyncErrorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java new file mode 100644 index 0000000..caa6b4b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/LabelTemplateAndParamModel.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.model.platform; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description: 获取打印模板和打印模板参数表的所有信息 + * @Reference: + * @Author: Crish + * @CreateDate:2019-08-23-11:38 + * @Modify: + **/ +@Data +class LabelTemplateAndParamModel implements Serializable { + private static final long serialVersionUID = -3612131411549787983L; +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 339fb7e..dbfbd1a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import org.hibernate.annotations.Type; import javax.persistence.*; +import java.util.List; /** * @Description : 打印模板 @@ -45,4 +46,8 @@ public class SysLabelTemplate extends BaseBean { @ApiParam(value ="模板参数拼接") @Transient private String paramsPack; + + @Transient + @ApiParam(value ="模板id对应的模板参数") + private List labelTemplateParamList; } From 1f1a9c39fc2c04e987eeabd14b65fcc060b36f4e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 23 Aug 2019 20:11:49 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- .../java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) 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 2328a81..a549eee 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 @@ -209,8 +209,11 @@ public class CommonEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SYS_LOCALE_RESOURCE_TYPE { - COMMON(1, "通用"),EXCEPTION(2, "异常"), - MODULE(10, "模块"), METHOD(11, "功能"), BUTTON(12, "按钮"), + COMMON(1, "通用"), + EXCEPTION(2, "异常"), + MODULE(10, "模块"), + METHOD(11, "功能"), + BUTTON(12, "按钮"), WEB(13, "前端"); private int value; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 82b0e3c..6c2a780 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1022,7 +1022,8 @@ public class ImppEnumUtil { PASSWORD(2, "密码安全策略"), MAIL(3, "邮件配置"), CONTACT(4, "联系人"), - BASIS(5, "基础"); + BASIS(5, "基础"), + CONFIG(6, "系统配置"); private int value; private String description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index dbfbd1a..457f603 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -43,7 +43,10 @@ public class SysLabelTemplate extends BaseBean { private String templateContent; // 参数拼接，多参数都好分隔，后台在做处理 + @Transient @ApiParam(value ="模板参数拼接") + private String paramsPack; + @Transient private String paramsPack; From cf026d6dee5a8cc5bd364111b3465ed391a42e83 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 26 Aug 2019 11:12:56 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java index 457f603..63e0250 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLabelTemplate.java @@ -48,9 +48,6 @@ public class SysLabelTemplate extends BaseBean { private String paramsPack; @Transient - private String paramsPack; - - @Transient @ApiParam(value ="模板id对应的模板参数") private List labelTemplateParamList; } From 11aff72404483f62924b0a378ffa46c35c9f5d23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 26 Aug 2019 15:14:24 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java index a01642f..f0201cb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java @@ -81,4 +81,31 @@ public class WmsTaskInfo extends BaseBean { @Column(name = "IS_CHECK_SN") @ApiParam("是否校验条码") public Integer isCheckSn; + + @Transient + @ApiParam("计划日期") + private String zdate; + + @Transient + @ApiParam("计划时间") + private String ztime; + + @Transient + @ApiParam(value = "客户编号") + private String custNo; + + @Transient + @ApiParam(value = "供应商编号") + private String vendorNo; + + public WmsTaskInfo(){}; + + public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){ + this.orderNo = orderNo; + this.taskStatus = taskStatus; + this.zdate = zdate; + this.ztime = ztime; + this.custNo = custNo; + this.vendorNo = vendorNo; + } } From 18eff49e63b3060a8854c863a1003af585251e62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Mon, 26 Aug 2019 17:05:45 +0800 Subject: [PATCH 5/6] =?UTF-8?q?hql=E8=AF=AD=E5=8F=A5=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 4dffc39..8398302 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 @@ -45,7 +45,9 @@ public class WmsHqlPack { DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr); - DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + if(StringUtils.isNotBlank(bean.getCreateDateTimeStart())&&StringUtils.isNotBlank(bean.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(),bean.getCreateDateTimeEnd(),"createDatetime",hqlStr,true); + } return hqlStr; } From 12f6e2c14b19a230422d9e8e4e5c7eba96f058f7 Mon Sep 17 00:00:00 2001 From: wangjie Date: Mon, 26 Aug 2019 19:04:08 +0800 Subject: [PATCH 6/6] =?UTF-8?q?mes-pcn=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E8=A1=A8=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java | 75 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java | 75 ++++++++++++++++++++++ .../pojo/mes/repository/MesPcnTaskRepository.java | 16 +++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 19 ++++++ 4 files changed, 185 insertions(+) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java new file mode 100644 index 0000000..0ccb531 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.pcn.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 :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java new file mode 100644 index 0000000..27daf23 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -0,0 +1,75 @@ +package cn.estsh.i3plus.pojo.mes.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 :mes-pcn定时任务工作清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_PCN_TASK") +@Api("mes-pcn定时任务工作清单") +public class MesPcnTask extends BaseBean { + + @Column(name="TASK_CODE") + @ApiParam("任务代码") + private String taskCode; + + @Column(name="TASK_NAME") + @ApiParam("任务名称") + private String taskName; + + @Column(name="TASK_DESCRIPTION") + @ApiParam("任务描述") + private String taskDescription; + + @Column(name="TASK_TYPE") + @ApiParam("任务类型") + private Integer taskType; + + @Column(name="TASK_MODULE") + @ApiParam("任务模块") + private String taskModule; + + @Column(name="TASK_CLASS") + @ApiParam("任务类名") + private String taskClass; + + @Column(name="TASK_PACKAGE") + @ApiParam("任务包名") + private String taskPackage; + + @Column(name="PCN_NAME") + @ApiParam("PCN节点名称") + private String pcnName; + + @Column(name="TASK_CYCLE_EXPS") + @ApiParam("任务周期表达式") + private String taskCycleExps; + + @Column(name="TASK_CYCLE_DESCRIPTION") + @ApiParam("任务周期描述") + private String taskCycleDescription; + + public int getTaskTypeVal() { + return this.taskType == null ? 0 : this.taskType; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java new file mode 100644 index 0000000..cd51761 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesPcnTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesPcnTask; +import org.springframework.stereotype.Repository; + +/** + * @Description :mes-pcn定时任务清单 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-08-26 + * @Modify: + **/ +@Repository +public interface MesPcnTaskRepository extends BaseRepository { +} 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 b509989..511125e 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 @@ -1103,4 +1103,23 @@ public class MesHqlPack { packBean.setOrderByStr(numberRule.orderBy()); return packBean; } + + /** + * mes-pcn定时任务清单 + * @param mesPcnTask + * @param organizeCode + * @return + */ + public static DdlPackBean getMesPcnTask(MesPcnTask mesPcnTask, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); + if (StringUtils.isNotEmpty(mesPcnTask.getTaskCode())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); + } + if (StringUtils.isNotEmpty(mesPcnTask.getTaskName())) { + DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); + } + + packBean.setOrderByStr(mesPcnTask.orderBy()); + return packBean; + } }