From 0d20685a5570e0a5ca68f4f2e06fee8b1a61deaf 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: Mon, 28 Sep 2020 16:06:19 +0800
Subject: [PATCH] =?UTF-8?q?fix(softswitch):ftp=E9=80=82=E9=85=8D=E5=99=A8?=
 =?UTF-8?q?=E5=B9=B6=E5=8F=91=E8=AF=BB=E5=8F=96=E6=96=87=E4=BB=B6=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/model/softswitch/SuitServerModel.java     |  1 +
 .../estsh/i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java  |  3 +++
 .../cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java  | 15 +++++++++++++++
 .../estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java   |  1 +
 .../i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java |  9 +++++++++
 5 files changed, 29 insertions(+)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
index e859e21..f80ec78 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java
@@ -41,6 +41,7 @@ public class SuitServerModel implements Serializable {
     private String requestId;
     // 传输单对象
     @XmlElement(name = "data")
+    @XStreamAlias("data")
     private Object obj;
     // 传输集合
     private List list;
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 93a159f..bce2e0d 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
@@ -123,6 +123,9 @@ public class BsSuitCaseFTP extends BaseBean {
     @Transient
     @ApiParam(value = "临时适配路径")
     private String tempSuitFilePath;
+    @Transient
+    @ApiParam(value = "临时适配路径")
+    private List<String> ftpFileList;
 
     @Transient
     @ApiParam(value = "适配文件列表")
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
index 7e2b460..9e98bc4 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitFile.java
@@ -85,4 +85,19 @@ public class BsSuitFile extends BaseBean {
     @ApiParam(value = "处理时间")
     private String processTime;
 
+    public void setFtpPathInfo(String ftpPathInfo){
+        if(ftpPathInfo == null){
+            return;
+        }
+
+        int pathIdx = ftpPathInfo.lastIndexOf("/");
+        if (pathIdx == -1) {
+            this.setFolderPath("/");
+            this.setFileName(ftpPathInfo);
+        }else{
+            this.setFolderPath(ftpPathInfo.substring(0,pathIdx+1));
+            this.setFileName(ftpPathInfo.substring(pathIdx + 1));
+        }
+    }
+
 }
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 d3af46c..f13d15b 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
@@ -128,6 +128,7 @@ public class BsSuitRecord extends BaseBean {
 
     @Column(name = "PROCESS_STATE")
     @ApiParam(value = "处理状态")
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.SUIT_PROCESS_STATUS.class)
     private Integer processState;
 
     @Column(name = "PROCESS_TIME")
diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
index cfa357f..e163e9e 100644
--- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
+++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
@@ -430,4 +430,13 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getNumEqualPack(bsBusiScript.getRefId(),"refId",ddlPackBean);
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlCheckSuitFile(BsSuitFile bsSuitFile){
+        DdlPackBean ddlPackBean  = DdlPackBean.getDdlPackBean(bsSuitFile);
+        DdlPreparedPack.getNumEqualPack(bsSuitFile.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFileName(),"fileName",ddlPackBean);
+        DdlPreparedPack.getStringEqualPack(bsSuitFile.getFolderPath(),"folderPath",ddlPackBean);
+        DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean);
+        return ddlPackBean;
+    }
 }