From 2443d1d8e671abaeba057b080abfc4ce7a5601a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Wed, 24 Mar 2021 11:20:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(softswitch):REST=E6=8C=89=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=A0=81=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/softswitch/bean/BsSuitCase.java    | 22 +++++++++++++++++++---
 .../pojo/softswitch/bean/BsSuitCaseREST.java       | 11 +++++++++++
 2 files changed, 30 insertions(+), 3 deletions(-)

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 69f23a8..028cd79 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
@@ -48,7 +48,7 @@ public class BsSuitCase extends BaseBean {
         if(caseTypeId == null) {
             return -1;
         }
-        return caseTypeId.intValue();
+        return caseTypeId;
     }
 
     public String getCaseTypeTxt() {
@@ -69,7 +69,7 @@ public class BsSuitCase extends BaseBean {
         if(suitTypeId == null){
             return -1;
         }
-        return suitTypeId.longValue();
+        return suitTypeId;
     }
 
     @Column(name = "SUIT_TYPE_NAME_RDD")
@@ -109,7 +109,7 @@ public class BsSuitCase extends BaseBean {
         if(isNeedCertification==null){
             return CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
         }
-        return isNeedCertification.intValue();
+        return isNeedCertification;
     }
 
     @Column(name = "IS_SAVE_EMPTY_MSG")
@@ -250,6 +250,22 @@ public class BsSuitCase extends BaseBean {
     @ApiParam(value = "绑定业务脚本Code")
     private String bindBusiScriptCode;
 
+    @Column(name = "IS_SUPPORT_RETRY")
+    @ApiParam(value = "是否支持重试")
+    private Integer isSupportRetry;
+
+    public int getIsSupportRetryVal() {
+        return isSupportRetry == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isSupportRetry;
+    }
+
+    @Column(name = "RETRY_INTERVAL")
+    @ApiParam(value = "重试间隔（s）")
+    private Integer retryInterval;
+
+    public int getRetryIntervalVal() {
+        return isSupportRetry == null ? 10: isSupportRetry;
+    }
+
     @Transient
     @ApiParam(value = "适配器套件明细")
     private  Object bsSuitCaseDetail;
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 2ccf61d..21054f7 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
@@ -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;
@@ -60,6 +61,16 @@ public class BsSuitCaseREST extends BaseBean {
         return isRequestBody == null ? CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() : isRequestBody;
     }
 
+    //CommonEnumUtil.HTTP_METHOD_TYPE
+    @Column(name = "RETRY_STRATEGY")
+    @ApiParam(value = "重试策略")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.class)
+    private Integer retryStrategy;
+
+    public int getRetryStrategyVal() {
+        return retryStrategy == null ? BlockSoftSwitchEnumUtil.BS_REST_RETRY_STRATEGY.HTTP_STATUS_CODE.getValue() : retryStrategy;
+    }
+
     @Transient
     @ApiParam(value = "请求头转换")
     private List<BsSuitCaseParam> requestHeaderList;