From c39462cd3577abc20188e690d784cc38f7883e61 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 12 Oct 2019 17:30:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 4 +--- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index dd0961b..9b2017c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -25,7 +25,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="ANDON_BRODCAST") +@Table(name="ANDON_BROADCAST") @Api("安灯广播") public class AndonBroadCast extends BaseBean { @Column(name="DEVICE_NUM") @@ -71,6 +71,4 @@ public class AndonBroadCast extends BaseBean { @Column(name="PLAY_TIME") @ApiParam("播放循环次数") private Integer playTime = 1; - - } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index e5ecfff..dfc769a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -28,7 +28,7 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="ANDON_BRODCAST_CFG") +@Table(name="ANDON_BROADCAST_CFG") @Api("生产区域") public class AndonBroadCastCfg extends BaseBean { @Column(name="ALARM_CODE") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 431a96d..2193643 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -702,7 +702,8 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum NOTICE_MESSAGE_SEND_TYPE { SMS("10","短信"), - EMAIL("20","邮箱"); + EMAIL("20","邮箱"), + BROAD_CAST("30","广播"); private String value; private String description;