From d8c740819cdc15a2280bfb6c17de9bcc38b75dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 30 Sep 2019 18:41:40 +0800 Subject: [PATCH] =?UTF-8?q?FTP=E9=80=82=E9=85=8D=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 4 ++-- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 9 +++++++- .../i3plus/pojo/softswitch/bean/BsSuitCaseFTP.java | 27 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitFile.java | 3 ++- .../pojo/softswitch/bean/BsSuitSchedule.java | 4 ++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 2 +- 6 files changed, 44 insertions(+), 5 deletions(-) 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 31c96aa..1a64e2d 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 @@ -133,7 +133,7 @@ public class BlockSoftSwitchEnumUtil { CLIENT_MQ_RABBIT_HELLO(SUIT_MODE.CLIENT ,CASE_TYPE.MQ,150001,"RabbitMQ Client Hello测试服务"), /* FTP */ - CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,15001,"Client FTP客户端适配器"); + CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"); private int value; private String description; @@ -663,7 +663,7 @@ public class BlockSoftSwitchEnumUtil { private FTP_ENCODE (int value,String encode, String description) { this.value = value; - this.value = value; + this.encode = encode; this.description = description; } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1019b4e..a39b0e4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; /** * @Description : @@ -170,6 +169,14 @@ public class CommonEnumUtil { public static String valueOfDescription(int val) {return valueOf(val);} public static int descriptionOfValue(String desc) {return descOf(desc);} + public static boolean valueOfBoolean(int val) { + if(val == TRUE.value){ + return true; + }else { + return false; + } + } + } /** 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 6dba956..db6e129 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; @@ -12,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description : @@ -46,16 +49,40 @@ public class BsSuitCaseFTP extends BaseBean { @ApiParam(value = "读取并清空") private Integer isReadAndEmpty; + public boolean isReadAndEmpty(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndEmpty); + } + @Column(name = "IS_READ_AND_DELETE") @ApiParam(value = "读取并删除") private Integer isReadAndDelete; + public boolean isReadAndDelete(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isReadAndDelete); + } + @Column(name = "IS_NEED_TRAVERSAL") @ApiParam(value = "是否需要遍历") private Integer isNeedTraversal; + public boolean isNeedTraversal(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isNeedTraversal); + } + @Column(name = "IS_INCREMENTAL_READ") @ApiParam(value = "是否增量读取") private Integer isIncrementalRead; + public boolean isIncrementalRead(){ + return CommonEnumUtil.TRUE_OR_FALSE.valueOfBoolean(isIncrementalRead); + } + + @Transient + @ApiParam(value = "是否增量读取") + private String tempSuitFilePath; + + @Transient + @ApiParam(value = "适配文件列表") + public List bsSuitFileList; + } 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 8c228ba..d6a3655 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 @@ -48,7 +48,8 @@ public class BsSuitFile extends BaseBean { @Column(name = "FILE_ID") @ApiParam(value = "文件id") - private String fileId; + @JsonSerialize(using = ToStringSerializer.class) + private Long fileId; @Column(name = "FILE_NAME") @ApiParam(value = "文件名称") diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java index 378a7cd..3f0cee2 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -39,6 +39,10 @@ public class BsSuitSchedule extends BaseBean { @ApiParam(value = "适配套件名称") private String suitCaseNameRdd; + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + @Column(name = "SCHEDULE_NAME") @ApiParam(value = "任务名称") private String scheduleName; 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 e5e4f2b..0f00093 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 @@ -179,7 +179,7 @@ public class SoftSwitchHqlPack { public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumNOEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleGroupName(),"scheduleGroupName",ddlPackBean);