From 0cc70fe2d059b4ed0a2f376307e6d9e58fcca3d5 Mon Sep 17 00:00:00 2001 From: E <1565181015@qq.com> Date: Thu, 9 Jan 2020 18:30:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90#1390=20=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E5=AE=A2=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java index f2a841b..60cabe4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java @@ -30,7 +30,7 @@ public class BasCustomer extends BaseBean { private static final long serialVersionUID = -1980207700343546396L; @Column(name = "CUST_NO") - @ApiParam(value = "客户编号") + @ApiParam(value = "客户编码") private String custNo; @Column(name = "CUST_NAME") @@ -54,7 +54,7 @@ public class BasCustomer extends BaseBean { private String custEmail; @Column(name = "CUST_TEL") - @ApiParam(value = "联系人电话") + @ApiParam(value = "电话号码") private String custTel; @Column(name = "CUST_FAX") From 2396863babacaf2a7ff4c868d2f6009d626bc676 Mon Sep 17 00:00:00 2001 From: zcg Date: Mon, 13 Jan 2020 14:15:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1:1383=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9B=91=E5=90=AC=E5=AE=9A=E6=97=B6=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=8A=93=E5=8F=96=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 70 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesMonitorTask.java | 2 +- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 ++ .../pojo/mes/pcn/model/DataAcquisitionModel.java | 35 +++++++++++ .../estsh/i3plus/pojo/mes/bean/MesMonitorTask.java | 2 +- .../java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 7 files changed, 116 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index 63a107d..a17cee1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -2732,4 +2732,74 @@ public class MesPcnEnumUtil { } } + /** + * MesMonitorTask实体对应的status值 监听任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MONITOR_TASK_STATUS { + + NORMAL(10, "正常"), + CLOSE(20, "关闭"); + + private int value; + private String description; + + MONITOR_TASK_STATUS(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; + } + } + + /** + * 是否解析 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_IS_PARSE { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + PLC_IS_PARSE(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; + } + } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java index d3b50c3..cba8ef5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 2f172df..d995e03 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -96,6 +96,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java new file mode 100644 index 0000000..f70aaaa --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/DataAcquisitionModel.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.mes.pcn.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : zcg + * @Date : 2020/1/10 0010 - 15:28 + */ +@Data +@Api("数据采集Model") +public class DataAcquisitionModel { + + @ApiParam("对象代码") + private String objectCode; + + @ApiParam("对象名称") + private String objectName; + + @ApiParam("字段代码") + private String fieldCode; + + @ApiParam("字段名称") + private String fieldName; + + @ApiParam("字段值") + private String fieldValue; +// +// @ApiParam("组号") +// private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java index 6cfb945..166a822 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMonitorTask.java @@ -37,7 +37,7 @@ public class MesMonitorTask extends BaseBean { @Column(name = "TASK_OBJECT_TYPE") @ApiParam("任务对象类型") - private String taskObjectType; + private Integer taskObjectType; @Column(name = "TASK_STATUS") @ApiParam("任务状态") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 5623665..98c4796 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -98,6 +98,10 @@ public class MesPlc extends BaseBean { @ApiParam("反馈值") private String feedValue; + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + @Transient @ApiParam("设备名称") private String equipmentName; 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 aa3623c..934414c 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 @@ -2123,7 +2123,7 @@ public class MesHqlPack { DdlPreparedPack.getStringLikerPack(monitorTask.getTaskName(), "taskName", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskObjectType())) { - DdlPreparedPack.getStringEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); + DdlPreparedPack.getNumEqualPack(monitorTask.getTaskObjectType(), "taskObjectType", packBean); } if (!StringUtils.isEmpty(monitorTask.getTaskStatus())) { DdlPreparedPack.getNumEqualPack(monitorTask.getTaskStatus(), "taskStatus", packBean);