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] =?UTF-8?q?mes=EF=BC=8C=20pcn=E6=9D=A1=E7=A0=81=E6=89=93?= =?UTF-8?q?=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; }