软件适配器 数据源适配器

单号生成高并发优化

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java

@@ -123,6 +123,16 @@ public class XStreamFactory {
     }
 
     /**
+     * Javabean 转XML
+     * @param <T>
+     * @return xml字符串
+     */
+    public static <T> String toXmlNoHeadLine(T t) {
+        xStream.processAnnotations(t.getClass());
+        return xStream.toXML(t);
+    }
+
+    /**
      * XML字符串转javabean
      *
      * @param xmlStr xml字符串

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

@@ -1,11 +1,15 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 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;
 
+import javax.persistence.Transient;
+
 /**
  * @Description : 适配器model
  * @Reference :
@@ -24,5 +28,4 @@ public class BsSuitCaseModel {
 
     @ApiParam(value = "socket适配套件")
     BsSocketSuitCase bsSocketSuitCase;
-
 }

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

@@ -49,6 +49,13 @@ public class BsSuitCase extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitTypeId;
 
+    public long getSuitTypeIdVal(){
+        if(suitTypeId != null){
+            return -1;
+        }
+        return suitTypeId.longValue();
+    }
+
     @Column(name = "SUIT_TYPE_NAME")
     @ApiParam(value = "适配类型名称")
     private String suitTypeName;
@@ -115,7 +122,11 @@ public class BsSuitCase extends BaseBean {
     private List<BsSuitCaseParam> bsSuitCaseParamList;
 
     @Transient
-    @ApiParam(value = "参数转换")
-    private List<BsParamAdapter> bsParamAdapterList;
+    @ApiParam(value = "入参转换")
+    private List<BsParamAdapter> bsInParamAdapterList;
+
+    @Transient
+    @ApiParam(value = "出参转换")
+    private List<BsParamAdapter> bsOutParamAdapterList;
 }
 

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

@@ -36,10 +36,6 @@ public class BsSuitCaseDataSource extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseId;
 
-    @Column(name = "DATA_SOURCE_MODE_ID")
-    @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）")
-    private Integer dataSourceModeId;
-
     @Column(name = "DATA_SOURCE_CODE")
     @ApiParam(value = "数据源编码")
     private String dataSourceCode;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceRepository.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
+public interface BsSuitCaseDataSourceRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
 
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseDataSourceTableRepository.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  */
 @Repository
-public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
+public interface BsSuitCaseDataSourceTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
 
 }
 

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -85,7 +85,6 @@ public class SoftSwitchHqlPack {
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
-        DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
 
         ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
@@ -266,4 +265,33 @@ public class SoftSwitchHqlPack {
         return ddlPackBean;
     }
 
+    /**
+     * 数据源适配操作查询条件封装
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlBsSuitCaseDataSourceTable(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(),"operateName",ddlPackBean);
+
+        return ddlPackBean;
+    }
+
+    /**
+     * 数据适配操作操作唯一校验
+     * @param bsSuitCaseDataSourceTable
+     * @return
+     */
+    public static DdlPackBean packHqlCheckBsSuitCaseDataSourceTableOnly(BsSuitCaseDataSourceTable bsSuitCaseDataSourceTable){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
+
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getId(), "id", ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(bsSuitCaseDataSourceTable.getSuitCaseId(), "suitCaseId", ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(bsSuitCaseDataSourceTable.getOperateName(), "operateName", ddlPackBean);
+
+        return ddlPackBean;
+    }
+
 }