From bc1825fd35c0f4f83ef46b372fb052ebecbf5323 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 17 Jan 2020 14:31:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90mes=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8CmesModel=E4=BF=AE=E6=94=B9,pcn=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E4=BF=AE=E6=94=B9=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +-- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 +-- .../src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java | 6 +++++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 067cb20..de4c9cb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4022,8 +4022,7 @@ public class MesEnumUtil { public enum MONITOR_TASK_OBJECT_TYPE { PLC(10, "PLC"), - DB(20, "DB"), - OTHER(30, "其他"); + DB(20, "DB"); private int value; private String description; 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 674878a..c5e0e37 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 @@ -2695,8 +2695,7 @@ public class MesPcnEnumUtil { public enum MONITOR_TASK_OBJECT_TYPE { PLC(10, "PLC"), - DB(20, "DB"), - OTHER(30, "其他"); + DB(20, "DB"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java index 62cb029..1ad0189 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesPlcModel.java @@ -89,6 +89,9 @@ public class MesPlcModel implements Serializable { @ApiParam("驱动") private String device; + @ApiParam("对象代码") + private String objectCode; + public MesPlcModel() { } @@ -96,7 +99,7 @@ public class MesPlcModel implements Serializable { public MesPlcModel(Long id, String equipmentCode, String equipmentName, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime, String organizeCode, String plcCode, String plcName, String plcModel, String plcIp, String channel, String tagName, String tagAddress, String dataType, String groupName, - String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device) { + String workCenterCode, String workCellCode, String plcCfg, String analysisRule, String isAnalysis, String device, String objectCode) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; @@ -122,5 +125,6 @@ public class MesPlcModel implements Serializable { this.analysisRule = analysisRule; this.isAnalysis = isAnalysis; this.device = device; + this.objectCode = objectCode; } } From db3b06071d3cbff78a2bd54fd345af8bba217dc5 Mon Sep 17 00:00:00 2001 From: zcg Date: Fri, 17 Jan 2020 14:42:15 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E6=9E=9A=E4=B8=BE=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=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/base/enumutil/MesEnumUtil.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index a5eefa3..716509d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -4022,8 +4022,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC(10, "PLC"); +// DB(20, "DB"); private int value; private String description; 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 42e6cd9..fd2bc47 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 @@ -2660,8 +2660,8 @@ public class MesPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MONITOR_TASK_OBJECT_TYPE { - PLC(10, "PLC"), - DB(20, "DB"); + PLC(10, "PLC"); +// DB(20, "DB"); private int value; private String description;