From 4fc8c2a80df5197962565bfe8f6ba5af04a2e269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 4 Jun 2020 20:40:17 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=80=82=E9=85=8D=E5=8F=91=E9=80=81=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 3 ++- .../i3plus/pojo/model/softswitch/SuitClientModel.java | 6 ++++++ .../pojo/softswitch/bean/BsSuitCaseDataSourceTable.java | 17 +++++++++++++---- .../i3plus/pojo/softswitch/bean/BsSuitCaseREST.java | 8 ++++++++ .../estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java | 5 +++++ 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 35431f8..0b8c98b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -876,7 +876,8 @@ public class BlockSoftSwitchEnumUtil { SUIT_MESSAGE(10, "适配信息"), REQUEST_ORGIN_PARAM(20, "请求原始参数"), ORIGINAL_MESSAGE(30, "原始报文"), - CONVERTED_MESSAGE(40, "转换报文"); + CONVERTED_MESSAGE(40, "转换报文"), + SUIT_SEND_MESSAGE(50, "适配发送报文"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 7241fe9..eac5415 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -56,6 +56,12 @@ public class SuitClientModel implements Serializable { private String suitMessage; /** + * 适配发送报文信息 + */ + @XStreamCDATA + private String suitSendMessage; + + /** * 请求来源 */ private Integer requestSource; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index decd680..74734ce 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.bean; +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -9,6 +11,7 @@ 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; @@ -41,15 +44,21 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "OPERATE_TYPE_ID") @ApiParam(value = "操作类型") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.class) private Integer operateTypeId; - public int getOperateTypeIdVal(){ - if(operateTypeId == null){ + public int getOperateTypeIdVal() { + if (operateTypeId == null) { return -1; } return operateTypeId.intValue(); } + + public String getOperateTypeIdTxt() { + return operateTypeId == null ? "无" : BlockSoftSwitchEnumUtil.DATABASE_OPERATE_TYPE.valueOfDescription(operateTypeId); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -62,8 +71,8 @@ public class BsSuitCaseDataSourceTable extends BaseBean { @ApiParam(value = "是否有返回") private Integer isReturn; - public int getIsReturnVal(){ - if(isReturn == null){ + public int getIsReturnVal() { + if (isReturn == null) { return -1; } return isReturn.intValue(); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java index eb8b13c..2ccf61d 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseREST.java @@ -46,12 +46,20 @@ public class BsSuitCaseREST extends BaseBean { @AnnoOutputColumn(refClass = CommonEnumUtil.HTTP_METHOD_TYPE.class) private Integer requestMethodId; + public String getRequestMethodIdTxt(){ + return requestMethodId == null ? "无" : CommonEnumUtil.HTTP_METHOD_TYPE.valueOfDescription(requestMethodId); + } + //CommonEnumUtil.TRUE_OR_FALSE @Column(name = "IS_REQUEST_BODY") @ApiParam(value = "是否使用requestBody") @AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class) private Integer isRequestBody; + public int getIsRequestBodyVal() { + return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody; + } + @Transient @ApiParam(value = "请求头转换") private List requestHeaderList; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java index 6a46fc7..469b391 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -120,6 +120,11 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "适配信息 longDataId") private String suitMessage; + // 移动至记录数据表 + @Column(name = "SUIT_SEND_MESSAGE") + @ApiParam(value = "适配发送报文") + private String suitSendMessage; + @Column(name = "PROCESS_STATE") @ApiParam(value = "处理状态") private Integer processState; From 5a0fea01cad7e5f9ece3e4e852eeaa49b2b9f01b Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 4 Jun 2020 20:53:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java index 7eba5df..a343b51 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java @@ -132,6 +132,14 @@ public class SwebPurchaseOrderDetails extends BaseBean { @ApiParam("是否为钢卷料") private Integer isSteel; + @Column(name = "PLAN_DATE") + @ApiParam("计划交货日期") + private String planDate; + + @Column(name = "PLAN_TIME") + @ApiParam("计划交货时间") + private String planTime; + /** * 不冗余主表数据 */ From f357293ca5d11f5a46ece645be37c736e448a7dc Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 5 Jun 2020 11:47:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?plc=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 12 +++++++----- 1 file 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 d115557..fb7b204 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 @@ -5741,16 +5741,18 @@ public class MesEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PLC_DATA_TYPE { - - INT("int", "数字"), - STRING("string", "字符串"), - BOOLEAN("boolean", "布尔"); + STRING("10", "String", "字符串"), + BOOLEAN("20","Boolean", "布尔"), + WORD("30", "Word", "整形-Word"), + DWORD("40","Dword", "整形-DWord"); private String value; + private String code; private String description; - PLC_DATA_TYPE(String value, String description) { + PLC_DATA_TYPE(String value, String code,String description) { this.value = value; + this.code = code; this.description = description; }