Merge remote-tracking branch 'origin/dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java

@@ -98,6 +98,15 @@ public class BlockSoftSwitchEnumUtil {
             }
             return tmp;
         }
+
+        public static SUIT_MODE valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**
@@ -1106,4 +1115,49 @@ public class BlockSoftSwitchEnumUtil {
 
     }
 
+    /**
+     * 适配重试方法
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum BS_SUIT_RETRY_METHOD {
+        RESET_MESSAGE_STATE(10, "重置报文状态"),
+        RE_EXECUTE(20, "重新执行");
+
+        private int value;
+        private String description;
+
+        private BS_SUIT_RETRY_METHOD (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 BS_SUIT_RETRY_METHOD valueOf(int val) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+    }
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -83,6 +83,13 @@ public class SuitServerModel implements Serializable {
     private BsSuitCaseModel bsSuitCaseModel;
 
     /**
+     * 适配发送报文信息
+     */
+    @XStreamOmitField
+    private String suitSendMessage;
+
+
+    /**
      * 请求来源
      */
 //    @XStreamImplicit

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java

@@ -51,6 +51,10 @@ public class BsSuitCase extends BaseBean {
         return caseTypeId.intValue();
     }
 
+    public String getCaseTypeTxt() {
+        return BlockSoftSwitchEnumUtil.CASE_TYPE.valueOfDescription(getCaseTypeIdVal());
+    }
+
     @Column(name = "CASE_DETAIL_ID")
     @ApiParam(value = "适配器明细id")
     @JsonSerialize(using = ToStringSerializer.class)

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -131,6 +131,11 @@ public class BsSuitRecord extends BaseBean {
     @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
+    public String getProcessStateTxt() {
+        return processState == null ? BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.UNPROCESSED.getDescription() :
+                BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.valueOfDescription(processState);
+    }
+
     @Column(name = "PROCESS_TIME")
     @ApiParam(value = "处理时间")
     private String processTime;