From 2c305e0ca645a0e448cc492cf9b3ffec07ecd71e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Feb 2020 09:13:54 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E7=B1=BB=E5=90=8D=E5=A4=A7=E5=86=99=EF=BC=88=E9=83=A8?= =?UTF-8?q?=E5=88=86=EF=BC=89=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8ae1488..c5da101 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -468,7 +468,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TagType { + public enum TAG_TYPE { BIN_TAG(10, "库位标签"), FINALIZER_TAG(20, "完成器标签"), SCREEN_TAG(30, "标签显示器"), @@ -477,7 +477,7 @@ public class PtlPcnEnumUtil { private int value; private String description; - TagType(int value, String description) { + TAG_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -694,7 +694,7 @@ public class PtlPcnEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum StatusType { + public enum STATUS_TYPE { START(10, "START", "开始状态"), FINISH(20, "FINISH", "完成状态"), TERMINATE(30, "TERMINATE", "中断状态"); @@ -703,7 +703,7 @@ public class PtlPcnEnumUtil { private String code; private String description; - StatusType(int value, String code, String description) { + STATUS_TYPE(int value, String code, String description) { this.value = value; this.code = code; this.description = description; From cac0f911502e9f2bfbb76a0d2505a9dd5aa33db2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 26 Feb 2020 09:15:03 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0BOM=E4=B8=AD=E7=88=B6?= =?UTF-8?q?=E7=89=A9=E6=96=99=E6=8F=8F=E8=BF=B0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java index 888e778..ea940a6 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlBom.java @@ -35,7 +35,7 @@ public class PtlBom extends BaseBean implements Serializable { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partNo; - @Column(name = "PART_NAME") + @Column(name = "PART_NAME", columnDefinition = "varchar(20) default '1'", nullable = false) @ApiParam("父物料描述") @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT) private String partName; From d56756e9e5f7c168693fbb9a666b85da75dfb2ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Wed, 26 Feb 2020 11:06:08 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E3=80=81=E5=8C=BA=E5=9F=9F=E3=80=81=E5=8C=BA=E6=AE=B5?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlEnumUtil.java | 85 +++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java index 01a5863..072df9e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlEnumUtil.java @@ -307,7 +307,7 @@ public class PtlEnumUtil { private String value; private String description; - PTL_PART_TYPE(String value, String description) { + private PTL_PART_TYPE(String value, String description) { this.value = value; this.description = description; } @@ -340,4 +340,87 @@ public class PtlEnumUtil { return tmp; } } + + /** + * 任务类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_TASK_TYPE { + JIT_TASK("10", "JIT任务"), + BILL_TASK("20", "单据任务"), + SINGLE_POINT_TASK("30", "单点任务"); + + private String value; + private String description; + + private PTL_TASK_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String descriptionOfValue(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * 任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PTL_TASK_STATUS { + CREATE(10, "创建"), + EXECUTION(20, "执行中"), + COMPLETE(30, "完成"), + CANCEL(40, "取消"); + + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private PTL_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } } From f01b3664c2c741f71aff64a38104cde957d0efc9 Mon Sep 17 00:00:00 2001 From: joke Date: Wed, 26 Feb 2020 12:48:35 +0800 Subject: [PATCH 4/9] =?UTF-8?q?[ptl:=2032=20=E4=BA=AE=E7=81=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=A8=8B=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 38 ++++++++++++++++++++-- .../pojo/ptl/repository/PtlAreaTaskRepository.java | 14 ++++++++ .../ptl/repository/PtlAreaTaskSeqRepository.java | 14 ++++++++ 3 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 8ae1488..ba57e59 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -593,9 +593,13 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum InterfaceSignalMessageType { - CONNECT_CONTROL_CMD(10, "111111", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "222222", "disconnectControlService", "断开控制器"), - LIGHT_ON_CMD(30, "333333", "lightOnService", "亮灯命令"); + CONNECT_CONTROL_CMD(10, "connect", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "disconnect", "disconnectControlService", "断开控制器"), + REFRESH_CONTROL_CMD(30, "refresh", "refreshControlService", "刷新"), + UNLOCK_CONTROL_CMD(40, "unlock", "unlockControlService", "解锁"), + LABEL_SELF_CHECK_CONTROL_CMD(50, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), + LIGHT_DETAIL_CONTROL_CMD(60, "lightDetail", "lightDetailControlService", "亮灯明细"), + SCAN_CONTROL_CMD(60, "scan", "scanControlService", "扫描"); private int value; private String code; @@ -722,4 +726,32 @@ public class PtlPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PtlControlStatus { + CONNECT(10, "CONNECT", "连接"), + DISCONNECT(20, "DISCONNECT", "断开"); + + private int value; + private String code; + private String description; + + PtlControlStatus(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java new file mode 100644 index 0000000..8d649d8 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-25 11:16 下午 + * @Modify: + **/ +public interface PtlAreaTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java new file mode 100644 index 0000000..dfee536 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskSeqRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTaskSeq; + +/** + * @Description : + * @Reference : + * @Author : joke + * @CreateDate : 2020-02-25 11:18 下午 + * @Modify: + **/ +public interface PtlAreaTaskSeqRepository extends BaseRepository { +} From f362f9931f2d1d9cec5d097315e5f3d82948b1c3 Mon Sep 17 00:00:00 2001 From: joke Date: Wed, 26 Feb 2020 15:42:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?[ptl:32=20=E4=BA=AE=E7=81=AF=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 94 ++++++++++++++++++++-- 1 file changed, 86 insertions(+), 8 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index f332b67..3c43fe3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -593,13 +593,14 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum InterfaceSignalMessageType { - CONNECT_CONTROL_CMD(10, "connect", "connectControlService", "连接控制器"), - DISCONNECT_CONTROL_CMD(20, "disconnect", "disconnectControlService", "断开控制器"), - REFRESH_CONTROL_CMD(30, "refresh", "refreshControlService", "刷新"), - UNLOCK_CONTROL_CMD(40, "unlock", "unlockControlService", "解锁"), - LABEL_SELF_CHECK_CONTROL_CMD(50, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), - LIGHT_DETAIL_CONTROL_CMD(60, "lightDetail", "lightDetailControlService", "亮灯明细"), - SCAN_CONTROL_CMD(60, "scan", "scanControlService", "扫描"); + CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), + DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), + REFRESH_CONTROL_CMD(30, "REFRESH_CONTROL_CMD", "refreshControlService", "刷新"), + SCAN_CONTROL_CMD(40, "SCAN_CONTROL_CMD", "scanControlService", "扫描"), + INIT_CONTROL_CMD(50, "INIT_MODULE_CONTROL_CMD", "initModuleControlService", "初始化页面"); +// UNLOCK_CONTROL_CMD(50, "UNLOCK_CONTROL_CMD", "unlockControlService", "解锁"), +// LABEL_SELF_CHECK_CONTROL_CMD(60, "labelSelfCheck", "labelSelfCheckControlService", "标签自检"), +// LIGHT_DETAIL_CONTROL_CMD(70, "LABEL_SELF_CHECK_CONTROL_CMD", "lightDetailControlService", "亮灯明细"); private int value; private String code; @@ -644,7 +645,8 @@ public class PtlPcnEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WsBusiType { - MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"); + MONITOR_PROCESS(10, "MONITOR_PROCESS", "控制器相关"), + INTERFACE_PROCESS(10, "INTERFACE_PROCESS", "界面处理"); private int value; private String code; @@ -754,4 +756,80 @@ public class PtlPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SectionTaskDetailStatus { + CREATE(10, "CREATE", "创建"), + COMPLETE(20, "COMPLETE", "完成"); + + private int value; + private String code; + private String description; + + SectionTaskDetailStatus(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + } + + /** + * 生成任务actor message type + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GenTaskMessageType { + GEN_TASK_CMD(10, "GEN_TASK_CMD", "", "生成任务"); + + private int value; + private String code; + private String callClass; + private String description; + + GenTaskMessageType(int value, String code, String callClass, String description) { + this.value = value; + this.code = code; + this.callClass = callClass; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCallClass() { + return callClass; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static InterfaceSignalMessageType getTypeByValue(String code) { + if (StringUtils.isEmpty(code)) { + return null; + } + for (InterfaceSignalMessageType enums : InterfaceSignalMessageType.values()) { + if (enums.getCode().equals(code)) { + return enums; + } + } + return null; + } + } + } From 40094365ce73d79021d0ae4e0b915abf5e80b525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 Feb 2020 16:22:32 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E3=80=90PTL=5F=E5=8C=BA=E6=AE=B5=E4=BA=AE?= =?UTF-8?q?=E7=81=AF=E4=BB=BB=E5=8A=A1=E6=98=8E=E7=BB=86=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 121 +++++++++++++++++++++ .../pojo/ptl/bean/PtlAreaSectionTaskDetail.java | 2 +- .../repository/PtlAreaSectionTaskRepository.java | 17 +++ .../pojo/ptl/repository/PtlAreaTaskRepository.java | 17 +++ 4 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index c5da101..e67c390 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -482,6 +482,16 @@ public class PtlPcnEnumUtil { this.description = description; } + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public int getValue() { return value; } @@ -722,4 +732,115 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + TASK_DETAIL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * PTL_区段、区域亮灯任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASKL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "执行中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java index 60f05df..38103b1 100644 --- a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlAreaSectionTaskDetail.java @@ -60,7 +60,7 @@ public class PtlAreaSectionTaskDetail extends BaseBean implements Serializable { @Column(name = "QTY") @ApiParam("拣货数量") - private Integer qty; + private Integer qty = 0; @Column(name = "LIGHT_MODE") @ApiParam("亮灯方式") diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java new file mode 100644 index 0000000..35d74c9 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaSectionTaskRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaSectionTask; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : 区段亮灯任务 + * @author : jessica.chen + * @date : 2020-02-26 13:49 + * @desc + */ + +public interface PtlAreaSectionTaskRepository extends BaseRepository { + +} diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java new file mode 100644 index 0000000..deb55b5 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/repository/PtlAreaTaskRepository.java @@ -0,0 +1,17 @@ +package cn.estsh.i3plus.pojo.ptl.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.ptl.bean.PtlActor; +import cn.estsh.i3plus.pojo.ptl.bean.PtlAreaTask; + +/** + * @Description : 区域亮灯任务 + * @author : jessica.chen + * @date : 2020-02-26 13:49 + * @desc + */ + +public interface PtlAreaTaskRepository extends BaseRepository { + +} From 35efadd243009c56ea733c1f93f1664296c4ef5b Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 27 Feb 2020 09:51:09 +0800 Subject: [PATCH 7/9] =?UTF-8?q?ptl=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3c43fe3..645d780 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -546,7 +546,7 @@ public class PtlPcnEnumUtil { CONNECT_CONTROL_CMD(10, "CONNECT_CONTROL_CMD", "connectControlService", "连接控制器"), DISCONNECT_CONTROL_CMD(20, "DISCONNECT_CONTROL_CMD", "disconnectControlService", "断开控制器"), LIGHT_ON_CMD(30, "LIGHT_ON_CMD", "lightOnService", "亮灯命令"), - LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "", "灭灯命令"), + LIGHT_OFF_CMD(40, "LIGHT_OFF_CMD", "lightOffService", "灭灯命令"), CONTROL_SIGNAL_CMD(50, "CONTROL_SIGNAL_CMD", "controlSignalService", "控制器反馈信号"), INTERFACE_SIGNAL_CMD(60, "INTERFACE_SIGNAL_CMD", "", "发送给界面actor通过websocket返回"); From ab9e9a8638883b101897ff00bf103748aa3776f5 Mon Sep 17 00:00:00 2001 From: joke Date: Thu, 27 Feb 2020 10:01:19 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java | 121 +++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java index 3c43fe3..b353195 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/PtlPcnEnumUtil.java @@ -482,6 +482,16 @@ public class PtlPcnEnumUtil { this.description = description; } + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public int getValue() { return value; } @@ -832,4 +842,115 @@ public class PtlPcnEnumUtil { } } + /** + * PTL_区段亮灯任务明细状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TASK_DETAIL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT_FINISH(20, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + TASK_DETAIL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + + /** + * PTL_区段、区域亮灯任务状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AREA_SECTION_TASKL_STATUS { + CREATE(10, "CREATE", "新建"), + RECEIPT(20, "RECEIPT", "执行中"), + RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"); + + private int value; + private String code; + private String description; + + AREA_SECTION_TASKL_STATUS(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } + } From e2d63434dba8bb6a0f27574fbee159149a64f677 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 27 Feb 2020 13:30:33 +0800 Subject: [PATCH 9/9] =?UTF-8?q?bug=20`7570`=20`7561`=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E4=BB=A3=E7=A0=81=E5=8E=BB=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index a82b8d4..22810be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; 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 index 01015d5..5c98174 100644 --- 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 @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent;