From c6031a0fc4b675af7ca95fbdc0652ba547855d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Thu, 4 Mar 2021 17:12:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(softswitch):=E6=B7=BB=E5=8A=A0sap-rfc?= =?UTF-8?q?=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 | 8 ++- .../pojo/model/softswitch/BsSuitCaseModel.java | 4 +- .../i3plus/pojo/softswitch/bean/BsSapConn.java | 69 ++++++++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCaseSap.java | 60 +++++++++++++++++++ .../softswitch/repository/BsSapConnRepository.java | 16 +++++ .../repository/BsSuitCaseSapRepository.java | 16 +++++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 32 ++++++++++ 7 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.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 19f713f..d42762b 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 @@ -26,7 +26,8 @@ public class BlockSoftSwitchEnumUtil { WEB_SERVICE(40,"WebService套件"), MQ(50,"消息队列套件"), WEB_SOCKET(60,"WebSocket套件"), - FTP(70,"FTP套件"); + FTP(70,"FTP套件"), + SAP(80,"SAP套件"); private int value; private String description; @@ -145,7 +146,10 @@ public class BlockSoftSwitchEnumUtil { /* FTP */ CLIENT_FTP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.FTP,160001,"Client FTP客户端适配器"), - SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"); + SERVER_FTP_IMPP(SUIT_MODE.SERVER,CASE_TYPE.FTP,260001,"Client FTP服务端适配器"), + + /* SAP */ + CLIENT_SAP_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.SAP,170001,"Client FTP客户端适配器"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 4c5ea4f..df0bd83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.common.Pager; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.*; import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiParam; @@ -46,6 +45,9 @@ public class BsSuitCaseModel implements Serializable { @ApiParam(value = "FTP 适配器") private BsSuitCaseFTP bsSuitCaseFTP; + @ApiParam(value = "Sap 适配器") + private BsSuitCaseSap bsSuitCaseSap; + @ApiParam(value = "分页数据") private Pager pager; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java new file mode 100644 index 0000000..8da9d02 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSapConn.java @@ -0,0 +1,69 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-15 15:40 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SAP_CONN") +@Api(value = "SAP连接信息", description = "SAP连接信息") +public class BsSapConn extends BaseBean { + + private static final long serialVersionUID = -8590500564480743293L; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接名称") + private String sapConnName; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_HOST") + @ApiParam(value = "SAP 应用服务器") + private String sapHost; + + @Column(name = "SAP_ROUTER") + @ApiParam(value = "SAP 路由") + private String sapRouter; + + @Column(name = "SAP_SYS_NO") + @ApiParam(value = "sap系统编号") + private String sapSysNo; + + @Column(name = "SAP_CLIENT") + @ApiParam(value = "sap集团") + private String sapClient; + + @Column(name = "SAP_USER") + @ApiParam(value = "sap用户名") + private String sapUser; + + @Column(name = "SAP_PWD") + @ApiParam(value = "sap密码") + private String sapPwd; + + @Column(name = "SAP_LANG") + @ApiParam(value = "sap登录语言") + private String sapLang; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java new file mode 100644 index 0000000..37c9b4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseSap.java @@ -0,0 +1,60 @@ +package cn.estsh.i3plus.pojo.softswitch.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-18 17:34 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_SAP") +@Api(value = "SAP适配器", description = "SAP适配器") +public class BsSuitCaseSap extends BaseBean { + + private static final long serialVersionUID = -2019771592688281243L; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + @JsonSerialize(using = ToStringSerializer.class) + private Long suitCaseId; + + @Column(name = "SAP_CONN_ID") + @ApiParam(value = "sap连接id") + @JsonSerialize(using = ToStringSerializer.class) + private Long sapConnId; + + @Column(name = "SAP_CONN_CODE") + @ApiParam(value = "sap连接代码") + private String sapConnCode; + + @Column(name = "SAP_CONN_NAME") + @ApiParam(value = "sap连接代码") + private String sapConnName; + + @Column(name = "BUSI_FUNC_NAME") + @ApiParam(value = "业务方法") + private String busiFuncName; + + @Column(name = "COMMIT_FUNC_NAME") + @ApiParam(value = "提交方法名") + private String commitFuncName; +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java new file mode 100644 index 0000000..a241382 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSapConnRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSapConn; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSapConnRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java new file mode 100644 index 0000000..8397e45 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseSapRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseSap; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2021-01-19 13:50 + * @Modify: + **/ +@Repository +public interface BsSuitCaseSapRepository extends BaseRepository { +} 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 2506bb2..021e734 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 @@ -442,4 +442,36 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumNOEqualPack(bsSuitFile.getId(),"id",ddlPackBean); return ddlPackBean; } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlBsSapConn(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnName(), "sapConnName", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } + + /** + * sap连接查询条件封装 + * @param bsSapConn + * @return + */ + public static DdlPackBean packHqlCheckBsSapConnOnly(BsSapConn bsSapConn){ + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSapConn.getId(), "id", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSapConn.getSapConnCode(), "sapConnCode", ddlPackBean); + + ddlPackBean.setOrderByStr(bsSapConn.orderBy()); + + return ddlPackBean; + } }