From 029d7eac620d6532a752aa48ffcce85c315b8c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 9 Sep 2019 11:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8Dmodel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/common/XStreamFactory.java | 2 +- ...hEnumUtil.java => BlockSoftSwitchEnumUtil.java} | 41 ++++++++++++++++++++-- .../i3plus/pojo/form/sqlpack/FormHqlPack.java | 2 ++ .../pojo/model/softswitch/BsSuitCaseModel.java | 28 +++++++++++++++ .../pojo/model/softswitch/SuitCoreModel.java | 12 ++++--- .../i3plus/pojo/softswitch/bean/BsDataSource.java | 2 +- .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 10 +++++- ...urceSuitCase.java => BsSuitCaseDataSource.java} | 13 +++++-- ...seTable.java => BsSuitCaseDataSourceTable.java} | 20 +++++++++-- .../repository/BsDataSourceSuitCaseRepository.java | 4 +-- .../BsDataSourceSuitCaseTableRepository.java | 4 +-- 11 files changed, 119 insertions(+), 19 deletions(-) rename modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/{SoftSwitchEnumUtil.java => BlockSoftSwitchEnumUtil.java} (92%) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/{BsDataSourceSuitCase.java => BsSuitCaseDataSource.java} (78%) rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/{BsDataSourceSuitCaseTable.java => BsSuitCaseDataSourceTable.java} (77%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java index 909db97..85dbd40 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java @@ -60,7 +60,7 @@ public class XStreamFactory { } }); - xStream.setMode(XStream.NO_REFERENCES); +// xStream.setMode(XStream.NO_REFERENCES); xStream.autodetectAnnotations(true); return xStream; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java similarity index 92% rename from modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename to modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 787d5c0..e6c7938 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -10,7 +10,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-08-13 9:34 * @Modify: **/ -public class SoftSwitchEnumUtil { +public class BlockSoftSwitchEnumUtil { /** * 套件类型 @@ -234,7 +234,7 @@ public class SoftSwitchEnumUtil { return tmp; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { + public static DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -267,7 +267,7 @@ public class SoftSwitchEnumUtil { return null; } - public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -443,4 +443,39 @@ public class SoftSwitchEnumUtil { } } + /** + * 数据库操作方式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATABASE_OPERATE_TYPE{ + READ(1,"读取"), + WRITE(2,"写入"); + + private int value; + private String description; + + DATABASE_OPERATE_TYPE(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; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java index dea5ebf..ed8e820 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java @@ -341,6 +341,8 @@ public final class FormHqlPack { DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNumEqualPack( + CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + DdlPreparedPack.getNumEqualPack( CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); // 按顺序字段进行排序 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 new file mode 100644 index 0000000..cf7567b --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.model.softswitch; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : 适配器model + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-09-04 15:30 + * @Modify: + **/ +@Data +public class BsSuitCaseModel { + + @ApiParam(value = "适配器") + BsSuitCase bsSuitCase; + + @ApiParam(value = "数据源适配套件") + BsSuitCaseDataSource bsDataSourceSuitCase; + + @ApiParam(value = "socket适配套件") + BsSocketSuitCase bsSocketSuitCase; + +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java index 3b748f8..2283d83 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java @@ -86,15 +86,19 @@ public class SuitCoreModel { private String suitResultMessage; /** - * * @param requestSource 请求来源 - * @param sslKey 适配认证对象 - * @param bsSuitCase 适配器信息 + * @param sslKey 适配认证对象 + * @param bsSuitCase 适配器信息 */ - public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { + public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){ + this(requestSource,sslKey, bsSuitCase,null); + } + + public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) { this.sslKey = sslKey; this.bsSuitCase = bsSuitCase; this.requestSource = requestSource; + this.bsSuitCaseDetail = bsSuitCaseDetail; // 设置套件类型 this.caseType = bsSuitCase.getCaseTypeId(); diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java index eeca022..5881a9c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -61,7 +61,7 @@ public class BsDataSource extends BaseBean { @Column(name = "DATA_SOURCE_STATUS") @ApiParam(value = "数据源状态") - private String dataSourceStatus; + private Integer dataSourceStatus; @Column(name = "DATA_SOURCE_DESCRIPTION") @ApiParam(value = "数据源描述") 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 f5d8f9e..db8c3a3 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 @@ -107,7 +107,15 @@ public class BsSuitCase extends BaseBean { private Integer suitCaseStatus; @Transient + @ApiParam(value = "适配器套件明细") + private Object bsSuitCaseDetail; + + @Transient @ApiParam(value = "适配器参数") - List bsSuitCaseParamList; + private List bsSuitCaseParamList; + + @Transient + @ApiParam(value = "参数转换") + private List bsParamAdapterList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java similarity index 78% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java index 738d19a..7ffc6d1 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java @@ -12,6 +12,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 : 数据库套件 @@ -25,9 +27,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE") @Api(value = "数据库套件", description = "数据库套件") -public class BsDataSourceSuitCase extends BaseBean { +public class BsSuitCaseDataSource extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -46,5 +48,12 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源名称") private String dataSourceNameRdd; + @Transient + @ApiParam(value = "数据源") + private BsDataSource bsDataSource; + + @Transient + @ApiParam(value = "数据库操作") + private List bsDataSourceSuitCaseTableList; } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java similarity index 77% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java index 5e86604..838514a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java @@ -25,9 +25,9 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") +@Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE") @Api(value = "数据库表操作", description = "数据库表操作") -public class BsDataSourceSuitCaseTable extends BaseBean { +public class BsSuitCaseDataSourceTable extends BaseBean { @Column(name = "SUIT_CASE_ID") @ApiParam(value = "套件id") @@ -42,6 +42,13 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @ApiParam(value = "操作类型") private Integer operateTypeId; + public int getOperateTypeIdVal(){ + if(operateTypeId == null){ + return -1; + } + return operateTypeId.intValue(); + } + @Column(name = "EXECUTE_SQL") @ApiParam(value = "执行sql") private String executeSql; @@ -52,7 +59,14 @@ public class BsDataSourceSuitCaseTable extends BaseBean { @Column(name = "IS_RETURN") @ApiParam(value = "是否有返回") - private String isReturn; + private Integer isReturn; + + public int getIsReturnVal(){ + if(isReturn == null){ + return -1; + } + return isReturn.intValue(); + } } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java index eadac50..2ef87e4 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseRepository extends BaseRepository { +public interface BsDataSourceSuitCaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java index 16100db..750f45a 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable; import org.springframework.stereotype.Repository; /** @@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository; * @Modify: */ @Repository -public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { +public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { }