From a43b17841ff8e3373eb4625e9a7ccd168fa34055 Mon Sep 17 00:00:00 2001
From: nies <shuai.nie@estsh.com>
Date: Fri, 24 Dec 2021 11:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=96=B0=E5=A2=9ESu?=
 =?UTF-8?q?itRetryModel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/enumutil/BlockSoftSwitchEnumUtil.java     |  3 ++-
 .../pojo/model/softswitch/SuitRetryModel.java      | 24 ++++++++++++++++++++++
 .../i3plus/pojo/softswitch/bean/BsSuitCase.java    |  8 ++++++++
 .../pojo/softswitch/bean/BsSuitCaseType.java       |  5 ++++-
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java

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 e7c518c..f14ae37 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
@@ -236,7 +236,8 @@ public class BlockSoftSwitchEnumUtil {
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
         SOCKET(8,"socket"),
-        RETRY(9,"重试");
+        RETRY(9,"重试"),
+        TEST(10,"手动测试");
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java
new file mode 100644
index 0000000..48ea646
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRetryModel.java
@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+
+/**
+ * @author ns
+ * @create 2021/12/22 0022 下午 13:39
+ */
+@Data
+@ApiModel("重试类型model")
+public class SuitRetryModel {
+    @ApiParam(value = "适配器代码")
+    private String suitCaseCode;
+
+    @ApiParam(value = "适配记录id")
+    private Long bsSuitRecordId;
+
+    @ApiParam(value = "适配器")
+    private BsSuitCase bsSuitCase;
+}
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
index c15f159..6e56daa 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java
@@ -266,6 +266,14 @@ public class BsSuitCase extends BaseBean {
         return retryInterval == null ? 10: retryInterval;
     }
 
+    @Column(name = "RETRY_TIME")
+    @ApiParam(value = "重试次数（s）")
+    private Integer retryTime;
+
+    public int getRetryTimeVal() {
+        return (retryTime == null || retryTime < 0) ? 1 : retryTime;
+    }
+
     @Transient
     @ApiParam(value = "适配器套件明细")
     private  Object bsSuitCaseDetail;
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java
index ce0efa9..ac42c49 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseType.java
@@ -34,7 +34,7 @@ public class BsSuitCaseType extends BaseBean {
     @Column(name = "SUIT_CASE_TYPE_ID")
     @ApiParam(value = "适配器类型id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long suitCaseTypeId;
+    private Integer suitCaseTypeId;
 
     @Column(name = "SUIT_CASE_TYPE_NAME")
     @ApiParam(value = "适配器类型名称")
@@ -48,6 +48,9 @@ public class BsSuitCaseType extends BaseBean {
     @ApiParam(value = "适配器适配失败报警邮箱")
     private String suitCaseTypeAlarmEmail;
 
+    @Column(name = "ENABLE_ALARM_EMAIL")
+    @ApiParam(value = "是否开启适配报警邮箱发送")
+    private Integer enableAlarmEmail;
 
 
 }