From 673c6d0fe22d6a89c9ecd8a2b74bbd9210d4ff6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 21 Sep 2020 18:12:48 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(softswitch):ftp-linux=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E4=BB=B6=E8=AF=BB=E5=8F=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java index f7fbfb9..93a159f 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java @@ -2,6 +2,7 @@ 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 cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; @@ -66,6 +67,15 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "ftp编码") private Integer encode; + @Column(name = "CONNECTION_MODE") + @ApiParam(value = "ftp连接模式") + @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.class) + private Integer connectionMode; + + public String getConnectionModeTxt(){ + return connectionMode == null ? "无" : BlockSoftSwitchEnumUtil.FTP_CONNECTION_MODE.valueOfDescription(connectionMode); + } + @Column(name = "IS_READ_AND_EMPTY") @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; From d6f4fa7f92b4a7724d198f71583cd929fc5dd3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 21 Sep 2020 18:18:58 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=8A=A5=E6=96=87=E5=A4=84=E7=90=86=E7=8A=B6=E6=80=81=E5=8F=8A?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 55 ++++++++++++++++++++-- .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 4 ++ 2 files changed, 54 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 97c8733..6cbc54a 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 @@ -830,7 +830,8 @@ public class BlockSoftSwitchEnumUtil { public enum SUIT_PROCESS_STATUS { UNPROCESSED(10, "未处理"), PROCESSING(20, "处理中"), - PROCESS(30, "已处理"); + PROCESS(30, "已处理"), + PROCESS_FAIL(40, "处理失败"); private int value; private String description; @@ -878,7 +879,8 @@ public class BlockSoftSwitchEnumUtil { REQUEST_ORGIN_PARAM(20, "请求原始参数"), ORIGINAL_MESSAGE(30, "原始报文"), CONVERTED_MESSAGE(40, "转换报文"), - SUIT_SEND_MESSAGE(50, "适配发送报文"); + SUIT_SEND_MESSAGE(50, "适配发送报文"), + PROCESS_RESULT(60, "处理结果"); private int value; private String description; @@ -919,6 +921,52 @@ public class BlockSoftSwitchEnumUtil { } /** + * ftp连接模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum FTP_CONNECTION_MODE { + LOCAL_ACTIVE_MODE(10, "本地主动模式"), + LOCAL_PASSIVE_MODE(20, "本地被动模式"), +// REMOTE_ACTIVE_MODE(30, "远程主动模式"), + REMOTE_PASSIVE_MODE(40, "远程被动模式"); + + private final int value; + private final String description; + + FTP_CONNECTION_MODE(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; + } + + public static FTP_CONNECTION_MODE valueOf(int val) { + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return FTP_CONNECTION_MODE.LOCAL_ACTIVE_MODE; + } + } + + /** * 脚本类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -957,7 +1005,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_TYPE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -1003,7 +1050,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_LANGUAGE valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; @@ -1050,7 +1096,6 @@ public class BlockSoftSwitchEnumUtil { } public static BS_SCRIPT_EXECUTE_METHOD valueOf(int val) { - String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { return values()[i]; 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 a7d0e35..d3af46c 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 @@ -138,6 +138,10 @@ public class BsSuitRecord extends BaseBean { @ApiParam(value = "脚本结果") private String scriptResult; + @Column(name = "PROCESS_RESULT") + @ApiParam(value = "处理结果") + private String processResult; + /************************************** 临时属性 ***************************************/ @Transient From c4f161e958a7462314bf277dc4729717d70a97af Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 09:28:08 +0800 Subject: [PATCH 3/4] Start Task #2795 --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index ce53f9e..297711e 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -117,6 +117,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @ApiParam(value = "重量") private Double weight; + @Column(name = "VEN_PRODUCT_TIME") + @ApiParam(value = "供应商生产日期") + private String venProductTime; + @Transient @ApiParam(value = "合同号") private String refNo; From 73809df82700f32aa44f3d98a0a6fb34516f3447 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Sep 2020 13:48:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=90=88=E5=B9=B6swebtest=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java index accc6b4..5807d18 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebRequireAlarm.java @@ -63,7 +63,11 @@ public class SwebRequireAlarm extends BaseBean { @Column(name = "COUNT_DATE") @ApiParam("日期") - private Double countDate; + private String countDate; + + @Column(name = "REQUEST_QTY") + @ApiParam("需求数量") + private String requestQty; @Transient @ApiParam("日期") diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java index 3e8547b..4d7e3b7 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebVendorStock.java @@ -65,6 +65,10 @@ public class SwebVendorStock extends BaseBean { @ApiParam("周") private String countWeek; + @Column(name = "REMARK") + @ApiParam("备注") + private String remark; + @Transient @ApiParam("日期") private String dateStart;