From ad1513770463b7d25cba13de7eccf529e1d0685b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 14 Jun 2019 16:23:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=89=E7=81=AF=20=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8E=9F=E5=9B=A0=20=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) 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 cd09db4..1a591fb 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 @@ -127,8 +127,8 @@ public class AndonHqlPack { DdlPackBean result = new DdlPackBean(); DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcCode(),"acCode", result); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); - DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAcName(),"acName", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result); getStringBuilderPack(andonAlarmCause, result); return result; @@ -394,7 +394,7 @@ public class AndonHqlPack { public static DdlPackBean packAndonAlarmDetailType(AndonAlarmDetailType andonAlarmDetailType) { DdlPackBean result = new DdlPackBean(); - DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); +// DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result); DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result); getStringBuilderPack(andonAlarmDetailType, result); @@ -430,4 +430,18 @@ public class AndonHqlPack { return result; } + + /** + * ANDON_事件原因 + * @param andonEventCause + * @return + */ + public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { + DdlPackBean result = new DdlPackBean(); + + + getStringBuilderPack(andonEventCause, result); + + return result; + } } From 215db96fa95f0c7e561cf49ce312f4ee4fb53fcd Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 14 Jun 2019 17:15:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=89=E7=81=AF=20=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= 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 1a591fb..e76d317 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 @@ -444,4 +444,18 @@ public class AndonHqlPack { return result; } + + /** + * ANDON_事件原因 + * @param haltType + * @return + */ + public static DdlPackBean packAndonHaltType(AndonHaltType haltType) { + DdlPackBean result = new DdlPackBean(); + + + getStringBuilderPack(haltType, result); + + return result; + } } From 2efbd7b6b890c2f19174c95922484f4a1be7578b Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Fri, 14 Jun 2019 19:18:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=89=E7=81=AF=20=E5=81=9C=E6=9C=BA?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=09=09=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=20=E4=BA=8B=E4=BB=B6=E5=8E=9F=E5=9B=A0=09=09=E5=A2=9E?= =?UTF-8?q?=E5=88=A0=E6=94=B9=E6=9F=A5=20=E5=91=BC=E5=8F=AB=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=09=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlpack/AndonHqlPack.java | 28 ++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) 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 e76d317..e172a05 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 @@ -438,23 +438,43 @@ public class AndonHqlPack { */ public static DdlPackBean packAndonEventCause(AndonEventCause andonEventCause) { DdlPackBean result = new DdlPackBean(); - - getStringBuilderPack(andonEventCause, result); return result; } /** - * ANDON_事件原因 + * ANDON_停机类型 * @param haltType * @return */ public static DdlPackBean packAndonHaltType(AndonHaltType haltType) { DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(haltType, result); + return result; + } - getStringBuilderPack(haltType, result); + /** + * ANDON_事件现象 + * @param eventPhenoMenon + * @return + */ + public static DdlPackBean packAndonEventPhenoMenon(AndonEventPhenoMenon eventPhenoMenon) { + DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(eventPhenoMenon, result); + + return result; + } + + /** + * ANDON_ 事件处理方法 + * @param eventPhenoMenon + * @return + */ + public static DdlPackBean packAndonEventMethod(AndonEventMethod eventPhenoMenon) { + DdlPackBean result = new DdlPackBean(); + getStringBuilderPack(eventPhenoMenon, result); return result; }