From e02f61c51fd0eca38078dc7b3ce91e68b6a3593f Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 14:40:25 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index ae88bf0..9f154de 100644 --- a/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -71,4 +71,8 @@ public class AndonPLC extends BaseBean { @Column(name = "GROUP_NO") @ApiParam(value = "分组号") private String groupNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; } From 0e090c7e08733ae374eccbcee42d3d09f4fa7ebf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 18:27:36 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BC=98=E5=8C=96POJO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bean/AndonAlarmCause.java | 4 ++ .../bean/AndonEventCause.java | 4 ++ .../bean/AndonEventMethod.java | 46 ++++++++++++++++++++++ .../sqlpack/AndonHqlPack.java | 31 +++++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java index 5487c78..5299981 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonAlarmCause.java @@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean { @Column(name = "PARENT_AC_CODE") @ApiParam(value = "父阶原因代码") private String parentAcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java index 1ed305d..c91b9b9 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventCause.java @@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean { @Column(name = "PARENT_EC_CODE") @ApiParam(value = "父阶原因代码") private String parentEcCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java new file mode 100644 index 0000000..f214629 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonEventMethod.java @@ -0,0 +1,46 @@ +package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件处理方法 + * @Reference : + * @Author : hansen.ke + * @CreateDate : 2019-05-13 17:16 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_EVENT_METHOD") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON_事件处理方法") +public class AndonEventMethod extends BaseBean { + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + private String emCode; + + @Column(name = "EM_NAME") + @ApiParam(value = "事件方法描述") + private String emName; + + @Column(name = "PARENT_EM_CODE") + @ApiParam(value = "父阶方法代码") + private String parentEmCode; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + private String alarmCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 34e5258..db59c17 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,7 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; +import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; import cn.estsh.i3plus.pojo.base.bean.BaseBean; @@ -63,4 +65,33 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询设备 + * @param mesEquipment + * @return + */ + public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result); + getStringBuilderPack(mesEquipment, result); + + return result; + } + + /** + * 按条件查询ANDON呼叫原因 + * @param andonAlarmCause + * @return + */ + public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonAlarmCause, result); + + return result; + } } From 4895b3ae85db5038a137a7bfd7db69d113ba4305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 19:23:15 +0800 Subject: [PATCH 3/8] =?UTF-8?q?ANDON=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/MesShift.java | 13 +++++++++++++ .../sqlpack/AndonHqlPack.java | 19 +++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java index 43cfce1..533c56a 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/MesShift.java @@ -28,6 +28,11 @@ import javax.persistence.Table; @Table(name="MES_SHIFT") @Api("班次信息") public class MesShift extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + @Column(name="SHIFT_CODE") @ApiParam("班次代码") private String shiftCode; @@ -43,4 +48,12 @@ public class MesShift extends BaseBean { @Column(name="WORK_TIMES") @ApiParam("作业时长") private String workTimes; + + public MesShift() { + } + + public MesShift(String workCenterCode,String organizeCode) { + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + } } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index db59c17..098f73b 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; -import cn.estsh.i3plus.pojo.andon.bean.AndonAlarmCause; -import cn.estsh.i3plus.pojo.andon.bean.MesEquipment; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell; -import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter; +import cn.estsh.i3plus.pojo.andon.bean.*; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; @@ -82,6 +79,20 @@ public class AndonHqlPack { } /** + * 按条件查询班次 + * @param mesShift + * @return + */ + public static DdlPackBean packHqlMesShift(MesShift mesShift){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result); + getStringBuilderPack(mesShift, result); + + return result; + } + + /** * 按条件查询ANDON呼叫原因 * @param andonAlarmCause * @return From 47bd2c0aa7edeea06f29c1ff7aac403890efd79c Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 19:28:22 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AE=89=E7=81=AF=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java | 8 ++++ .../sqlpack/AndonHqlPack.java | 50 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 49 +++++++++++++++++++++ .../i3plus/pojo/model/andon/AndonOpcModel.java | 32 ++++++++++++++ 4 files changed, 139 insertions(+) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java index 9f154de..8bccd4e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java @@ -75,4 +75,12 @@ public class AndonPLC extends BaseBean { @Column(name = "ALARM_CODE") @ApiParam(value = "安灯类型代码") private String alarmCode; + + @Column(name = "TAG_BUSINESS_TYPE") + @ApiParam(value = "标签业务类型") + private String tagBusinessType; + + @Column(name = "IS_ALARM_STATUS") + @ApiParam(value = "是否按灯状态", example = "1") + private Integer isAlarmStatus; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 12b3098..d0a22e1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; +import cn.estsh.i3plus.pojo.andon.bean.AndonPLC; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; +import org.apache.commons.lang3.StringUtils; + /** * @Description : 安灯对象查询封装 * @Reference : @@ -8,4 +15,47 @@ package cn.estsh.i3plus.pojo.andon.sqlpack; * @Modify: **/ public class AndonHqlPack { + /** + * 封装公用查询参数 + * + * @param bean 实体对象 + * @param hqlStr 查询语句 + * @return 封装完成的查询语句 + */ + public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) { + + // 判断工厂代码是否为空 + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); + } + + // 封装有效状态和删除状态 + DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); + + return hqlStr; + } + + /** + * 按灯PLC查询条件 + * + * @param andonPLC plc实体 + * @return + */ + public static DdlPackBean packHqlAndonPLCInfo(AndonPLC andonPLC) { + DdlPackBean result = new DdlPackBean(); + + //查询参数封装 + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result); + DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result); + + getStringBuilderPack(andonPLC, result); + return result; + } } 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 new file mode 100644 index 0000000..1f6e33a --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * @Description : + * @Reference : + * @Author : silliter + * @CreateDate : 2019-05-13 15:53 + * @Modify: + **/ +public class AndonEnumUtil { + /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_ALARM_STATUS{ + + YES(10,"需要按灯"), + ON(20,"不需要按灯"); + + private int value; + private String description; + + IS_ALARM_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; + } + } +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java new file mode 100644 index 0000000..94ef1a2 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonOpcModel.java @@ -0,0 +1,32 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonOpcModel { + + /** + * 通常为localhost + */ + @ApiParam("opcserver地址-ip") + private String host; + + /** + * opcserver的名称 + */ + @ApiParam("opcserver名称") + private String serverProgId; + + /** + * 一般为channel + */ + @ApiParam("第一层路径") + private String accessPath; + + /** + * 一般为device.tag + */ + @ApiParam("剩余路径名称") + private String itemName; +} From c9c470a27f8a8fde4254f5d40d0864827ee424ba Mon Sep 17 00:00:00 2001 From: Silliter Date: Mon, 13 May 2019 21:42:46 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=89=A9=E7=90=86?= =?UTF-8?q?=E5=AE=89=E7=81=AF=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 17 ++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 97 ++++++++++++++++++++++ .../i3plus/pojo/model/andon/AndonResultBean.java | 30 +++++++ 3 files changed, 144 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 66591c5..034e022 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -135,4 +135,21 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询按灯队列信息 + * @param andonManageQueue + * @return + */ + public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result); + DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonManageQueue, result); + + return result; + } } 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 1f6e33a..37f53bd 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 @@ -46,4 +46,101 @@ public class AndonEnumUtil { return tmp; } } + + /** + * 按灯业务状态 + * 安灯状态=10，工号 =20 ，读取状态=30 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_BUSI_FLAG{ + + ALARM_FLAG("10","按灯状态"), + USER_CODE("20","工号"), + READ_FLAG("30", "读取状态"); + + private String value; + private String description; + + ALARM_BUSI_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 按灯标识 + * 1-呼叫，2-签到，3-解决 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ALARM_FLAG{ + + CALL(1,"呼叫"), + SIGN(2,"签到"), + RESOLVE(3, "解决"), + CANCEL(4, "撤销"); + + private int value; + private String description; + + ALARM_FLAG(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; + } + } + + /** + * 按灯动作标志 + * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ANDON_ACTION_FLAG{ + + CALL_ACTION("10","呼叫动作"), + SIGN_ACTION("20","签到动作"), + CANCEL_ACTION("30", "撤销动作"), + RESOLVE_ACTION("40", "解决动作"), + SHIFG_CALL_ACTION("50", "转呼动作"); + + private String value; + private String description; + + ANDON_ACTION_FLAG(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java new file mode 100644 index 0000000..8455e8e --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/andon/AndonResultBean.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.model.andon; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +@Data +public class AndonResultBean { + + @ApiParam("是否成功") + private boolean success; + + @ApiParam("处理信息") + private String msg; + + @ApiParam("处理结果") + private String result; + + public AndonResultBean(boolean success, String msg) { + super(); + this.success = success; + this.msg = msg; + } + + public AndonResultBean(boolean success, String msg, String result) { + super(); + this.success = success; + this.msg = msg; + this.result = result; + } +} From 1b702d0821a939888d8bac2ed55cae0d4a13d906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Mon, 13 May 2019 21:57:37 +0800 Subject: [PATCH 6/8] =?UTF-8?q?ANDON=5FHQLPACK=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java index 66591c5..afa1a84 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java @@ -135,4 +135,18 @@ public class AndonHqlPack { return result; } + + /** + * 按条件查询ANDON事件原因 + * @param andonEventCause + * @return + */ + public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){ + DdlPackBean result = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result); + getStringBuilderPack(andonEventCause, result); + + return result; + } } From 8ccc265f0d9735f78b3232d9164f38feda2afb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 09:51:08 +0800 Subject: [PATCH 7/8] =?UTF-8?q?ANDON=E6=9E=9A=E4=B8=BE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 37f53bd..dbc7b6b 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 @@ -82,16 +82,18 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_FLAG{ - CALL(1,"呼叫"), - SIGN(2,"签到"), - RESOLVE(3, "解决"), - CANCEL(4, "撤销"); + CALL(1,"10","呼叫"), + SIGN(2,"20","签到"), + RESOLVE(3,"30","解决"), + CANCEL(4,"40", "撤销"); private int value; + private String code; private String description; - ALARM_FLAG(int value, String description) { + ALARM_FLAG(int value,String code, String description) { this.value = value; + this.code = code; this.description = description; } @@ -99,6 +101,8 @@ public class AndonEnumUtil { return value; } + public String getCode(){ return code; } + public String getDescription() { return description; } From ba368a032728128cc4a8b482ad9e8f76af19bcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 14 May 2019 10:16:30 +0800 Subject: [PATCH 8/8] =?UTF-8?q?ANDON=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndonManagetQueueRepository.java => IAndonManageQueueRepository.java} | 2 +- ...onManagetRecordRepository.java => IAndonManageRecordRepository.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/{IAndonManagetQueueRepository.java => IAndonManageQueueRepository.java} (80%) rename modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/{IAndonManagetRecordRepository.java => IAndonManageRecordRepository.java} (80%) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java index e4027cc..4300b50 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetQueueRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageQueueRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetQueueRepository extends BaseRepository { +public interface IAndonManageQueueRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java similarity index 80% rename from modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java rename to modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java index 13623d0..42bb09c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManagetRecordRepository.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/repository/IAndonManageRecordRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface IAndonManagetRecordRepository extends BaseRepository { +public interface IAndonManageRecordRepository extends BaseRepository { }