From cecd37a1e79bccd7a2d17de20511b5ac88d8b0a5 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Tue, 8 Oct 2019 16:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Xml=20=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/enumutil/BlockSoftSwitchEnumUtil.java     | 19 ++++++++++-
 .../pojo/model/softswitch/SuitParamModel.java      | 37 ++++++++++++++++++++++
 .../i3plus/pojo/softswitch/bean/BsSuitCase.java    |  4 +++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.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 1a64e2d..7f1caa6 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
@@ -477,7 +477,9 @@ public class BlockSoftSwitchEnumUtil {
         STRING(20,"字符串"),
         BOOLEAN(30,"布尔"),
         MAP(40,"字典"),
-        LIST(50,"列表");
+        LIST(50,"列表"),
+        JAVA_OBJECT(60,"Java Object"),
+        JAVA_DYNAMIC_OBJECT(61,"Java Dynamic Object");
 
         private int value;
         private String description;
@@ -504,6 +506,21 @@ public class BlockSoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static PARAM_VALUE_TYPE valueOfValueStr(String value){
+            PARAM_VALUE_TYPE result = PARAM_VALUE_TYPE.STRING;
+            try {
+                if(StringUtils.isNotBlank(value)){
+                    for (int i = 0; i < values().length; i++) {
+                        if (values()[i].value == Integer.parseInt(value)) {
+                            return values()[i];
+                        }
+                    }
+                }
+            }catch (Exception e){
+            }
+            return result;
+        }
     }
 
     /**
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
new file mode 100644
index 0000000..19b19eb
--- /dev/null
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitParamModel.java
@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wei.peng
+ * @CreateDate : 2019/10/8 下午1:18
+ * @Modify:
+ **/
+@Data
+public class SuitParamModel {
+
+    /* 标签名称 */
+    private String tagName;
+    /* 标签 id 属性值  */
+    private String id;
+    /* 标签 name 属性值 */
+    private String name;
+    /* 标签唯一标识 */
+    private String pathKey;
+    /* 标签内容 */
+    private String value;
+    /* 标签类型 Default:PARAM_VALUE_TYPE.STRING */
+    private Integer type;  // BlockSoftSwitchEnumUtil.PARAM_VALUE_TYPE
+
+    /* 标签属性 */
+    private Map<String,String> attr;
+    /* 父节点 */
+    private SuitParamModel parent;
+    /* 标签子集 */
+    private List<SuitParamModel> childList;
+}
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 b22545b..c24db02 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
@@ -215,6 +215,10 @@ public class BsSuitCase extends BaseBean {
     private  BsSslKey bsSslKey;
 
     @Transient
+    @ApiParam(value = "适配器套件明细")
+    private String paramXml;
+
+    @Transient
     @ApiParam(value = "适配器参数")
     private List<BsSuitCaseParam> bsSuitCaseParamList;