From 66f49f3fdc1b51bcc325a3057f4a64df153a8c22 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Mon, 12 Aug 2019 09:50:58 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java | 8 +++++--- .../cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index ecab56a..6b64736 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -831,8 +831,9 @@ public class BlockFormEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE(300, "DATE", "日期(yyyy-MM-dd)"), - DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), + DATE(300, "DATE", "日期"), +// DATE(300, "DATE", "日期(yyyy-MM-dd)"), +// DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), DICTIONARY(800, "DICT_SELECT", "字典"), CASCADE(900, "CASCADE", "级联"); @@ -973,7 +974,8 @@ public class BlockFormEnumUtil { NUM_ADD(20, "ADD", "加法计算",Double.class), NUM_LESS(30, "MIN", "减法计算",Double.class), NUM_MAKE(40, "MUL", "乘法计算",Double.class), - NUM_DIVISION(50, "DIVISION", "除法计算",Double.class); + NUM_DIVISION(50, "DIVISION", "除法计算",Double.class), + JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class); private int value; private String code; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java index 01c97de..688db18 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementPropertyVirtual.java @@ -70,6 +70,11 @@ public class BfElementPropertyVirtual extends BaseBean { @ApiParam(value = "提示信息") private String propertyLabelText; + @Lob + @ApiParam(value = "自定义执行SQL") + @Column(name = "PROPERTY_EXECUTE_SQL") + private String propertyExecuteSql; + @Column(name = "PROPERTY_SORT") @ApiParam(value = "显示顺序") private Integer propertySort; diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java index e1f5a71..115b32d 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfMenu.java @@ -37,6 +37,10 @@ public class BfMenu extends BaseBean { @ApiParam(value ="菜单名称") private String menuName; + @Column(name="MENU_CODE") + @ApiParam(value ="功能代码(唯一校验，路径跳转使用)") + private String menuCode; + @Column(name="PARENT_ID") @ApiParam(value ="父级菜单id") @JsonSerialize(using = ToStringSerializer.class) From 9ee2901346da9e3025ae6932b00dc3ea37bc8a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 12 Aug 2019 18:23:27 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=86=E7=BB=84=20=E4=BC=98=E5=8C=96redis=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 35 +++++++++++ .../i3plus/pojo/platform/bean/SysDictionary.java | 5 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 70 ++++++++++++++-------- 3 files changed, 84 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 4a39acd..82b0e3c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1152,4 +1152,39 @@ public class ImppEnumUtil { return tmp; } } + + + /** + * 字典分组 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DICTIONARY_GROUP { + SYSTEM(1, "系统字典"), + EXTERNAL(2, "外部人员"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private DICTIONARY_GROUP(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOf(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-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 32929c7..5122623 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -45,6 +45,11 @@ public class SysDictionary extends BaseBean { @ApiParam(value ="字典所属模块") private Integer dictionarySoftType; + //枚举 ImppEnumUtil.DICTIONARY_GROUP + @Column(name="DICTIONARY_GROUP") + @ApiParam(value ="字典分组") + private Integer dictionaryGroup; + // 根节点-1 @Column(name="PARENT_ID") @ApiParam(value ="父节点" , example = "-1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index bcff699..2d777b9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -316,24 +316,24 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionary(SysDictionary dictionary) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryPage(SysDictionary dictionary) { + DdlPackBean result = new DdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(dictionary.getName(), "name", result); - HqlPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); + DdlPreparedPack.getStringLikerPack(dictionary.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ - HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); + DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } - HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); - HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -550,20 +550,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryCode(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -571,20 +571,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryValue(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -932,4 +932,22 @@ public class CoreHqlPack { return packBean; } + + /** + * 按条件查询字典 + * @param sysDictionary + * @return + */ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + DdlPackBean packBean = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); + + return packBean; + } } \ No newline at end of file From 92d4bf46ce3e9ae1646ee73b2780db678cee911e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 13 Aug 2019 09:34:45 +0800 Subject: [PATCH 03/15] #5255,#5039 --- .../i3plus/pojo/wms/bean/WmsActionStepCallParam.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java index ceff079..ee0b539 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCallParam.java @@ -24,18 +24,17 @@ import javax.persistence.Transient; **/ @Data @Entity -@Table(name="WMS_ACTION_STEP_CALL_PARAM") +@Table(name = "WMS_ACTION_STEP_CALL_PARAM") @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Api(value="作业步骤调用参数表",description = "作业步骤调用参数表") +@Api(value = "作业步骤调用参数表", description = "作业步骤调用参数表") public class WmsActionStepCallParam extends BaseBean { private static final long serialVersionUID = -2813779192436803301L; @Column(name = "AGD_ID") @ApiParam(value = "流程明细编号") @JsonSerialize(using = ToStringSerializer.class) - private Long agdId; @Column(name = "SEQ") @@ -59,4 +58,15 @@ public class WmsActionStepCallParam extends BaseBean { @ApiParam(value = "组件名称") private String amName; + @Transient + @ApiParam(value = "流程ID") + private Long agId; + + public WmsActionStepCallParam() { + } + + public WmsActionStepCallParam(Long id, Long agId) { + this.id = id; + this.agId = agId; + } } From b604c5d9a026716d2d0f0d369f2064d96311039b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 13 Aug 2019 11:32:18 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 610d8e5..281e113 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -143,10 +143,14 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - @Transient - @ApiParam("交易类型") + @Column(name="TRANS_TYPE_NAME") + @ApiParam(value ="交易名称") private String transTypeName; + /*@Transient + @ApiParam("交易类型") + private String transTypeName;*/ + @Transient @ApiParam("仓库名称") private String warehouseName; From ff52a412d4296f23d3f8568d86ad2bc9a4cf19b6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 13 Aug 2019 13:48:45 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8330f08..30eeaec 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -334,7 +334,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); @@ -922,6 +922,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransTypeName(), "transTypeName", result); getStringBuilderPack(wmsTransQuan, result); From 68e4b74e0a42d0e9d4e631bd68b5deceb21326de Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 13 Aug 2019 13:59:47 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=B3=BB=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 28 +++++++++++----------- .../i3plus/pojo/platform/bean/SysUserInfo.java | 24 +++++++++---------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index b607923..9afa74c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -105,20 +105,20 @@ public class SysUser extends BaseBean { @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Lob - @Column(name="ROLE_NAMES_RDD") - @ApiParam(value ="角色名称集合") - private String roleNamesRdd; - - @Lob - @Column(name="DEPARTMENT_NAMES_RDD") - @ApiParam(value ="部门名称集合") - private String departmentNamesRdd; - - @Lob - @Column(name="ORGANIZE_NAMES_RDD") - @ApiParam(value ="组织名称集合") - private String organizeNamesRdd; +// @Lob +// @Column(name="ROLE_NAMES_RDD") +// @ApiParam(value ="角色名称集合") +// private String roleNamesRdd; +// +// @Lob +// @Column(name="DEPARTMENT_NAMES_RDD") +// @ApiParam(value ="部门名称集合") +// private String departmentNamesRdd; +// +// @Lob +// @Column(name="ORGANIZE_NAMES_RDD") +// @ApiParam(value ="组织名称集合") +// private String organizeNamesRdd; /********************************** 非数据库信息 ********************************/ diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java index 51d7362..0a3735b 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java @@ -183,28 +183,28 @@ public class SysUserInfo extends BaseBean { @ApiParam(value ="部门名称" , access ="部门名称") private String departmentNameRdd; - @Column(name="DEPARTMENT_NAMES_RDD") - @ApiParam(value ="部门集合" , access ="部门集合") - @AnnoOutputColumn(hidden = true) - private String departmentNamesRdd; +// @Column(name="DEPARTMENT_NAMES_RDD") +// @ApiParam(value ="部门集合" , access ="部门集合") +// @AnnoOutputColumn(hidden = true) +// private String departmentNamesRdd; @Column(name="POSITION_NAME_RDD") @ApiParam(value ="岗位名称" , access ="岗位名称") private String positionNameRdd; - @Column(name="POSITION_NAMES_RDD") - @ApiParam(value ="岗位集合" , access ="岗位集合") - @AnnoOutputColumn(hidden = true) - private String positionNamesRdd; +// @Column(name="POSITION_NAMES_RDD") +// @ApiParam(value ="岗位集合" , access ="岗位集合") +// @AnnoOutputColumn(hidden = true) +// private String positionNamesRdd; @Column(name="ORGANIZE_NAME_RDD") @ApiParam(value ="组织名称" , access ="组织名称") private String organizeNameRdd; - @Column(name="ORGANIZE_NAMES_RDD") - @ApiParam(value ="组织集合" , access ="组织集合") - @AnnoOutputColumn(hidden = true) - private String organizeNamesRdd; +// @Column(name="ORGANIZE_NAMES_RDD") +// @ApiParam(value ="组织集合" , access ="组织集合") +// @AnnoOutputColumn(hidden = true) +// private String organizeNamesRdd; /********************************** 非数据库信息 ********************************/ From 46c710e55927d0e137e84a1234892e633bb95d1e Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 13 Aug 2019 14:01:09 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E8=99=9A=E6=8B=9F=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/enumutil/BlockFormEnumUtil.java | 66 ++++++++++++++++++---- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java index 6b64736..2fa0f79 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockFormEnumUtil.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.util.Date; + /** * @Description : 模块表单枚举类 * @Reference : @@ -831,7 +833,7 @@ public class BlockFormEnumUtil { TEXT(200, "TEXT", "文本"), NUMBER(210, "NUMBER", "数字"), PASSWORD(230, "PASSWORD", "密码"), - DATE(300, "DATE", "日期"), + DATE_TIME(300, "DATE", "日期"), // DATE(300, "DATE", "日期(yyyy-MM-dd)"), // DATE_TIME(310, "DATE_TIME", "时间(yyyy-MM-dd hh:mm:ss)"), // ELEMENT(700, "DICT_SELECT", "元素"), @@ -1164,16 +1166,16 @@ public class BlockFormEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PROPERTY_TYPE { - STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,null), - CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), - INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), - BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,null), + STRING(10, "String", "字符串", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.LIKE,""), + CHAR(11, "Character", "单字符", "java.lang.Character", Character.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,""), + INTEGER(20, "Integer", "短整型", "java.lang.Integer", Integer.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), + LONG(21, "Long", "长整型", "java.lang.Long", Long.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0"), + DOUBLE(30, "Double", "大浮点型", "java.lang.Double", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), + FLOAT(31, "Float", "小浮点型", "java.lang.Float", Float.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), + BIG_DECIMAL(32, "Double", "大浮点型", "java.math.BigDecimal", Double.class,PROPERTY_CONTROL_TYPE.NUMBER,SQL_WHERE.EQUAL,"0.0"), BOOLEAN(40, "Boolean", "布尔值", "java.lang.Boolean", Boolean.class,PROPERTY_CONTROL_TYPE.RADIO,SQL_WHERE.EQUAL,null), - BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null); -// DATE(60, "Date", "日期", "java.lang.String", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,null); + BYTE(50, "Byte", "字节", "java.lang.Byte", Byte.class,PROPERTY_CONTROL_TYPE.TEXT,SQL_WHERE.EQUAL,null), + DATE_TIME(12, "String", "日期时分秒", "java.sql.Timestamp", String.class,PROPERTY_CONTROL_TYPE.DATE_TIME,SQL_WHERE.BETWEEN,null,"yyyy-MM-dd hh:mm:ss"); /** * 属性类型值 @@ -1206,11 +1208,28 @@ public class BlockFormEnumUtil { private SQL_WHERE defaultWhere; /** + * 默认 格式化 方式 + */ + private String defaultFormat; + + /** * 默认查询关系 */ private String defaultValue; - private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName,PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue) { this.value = value; this.code = code; this.description = description; @@ -1219,6 +1238,20 @@ public class BlockFormEnumUtil { this.controlType = controlType; this.defaultWhere = defaultWhere; this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; + } + + private PROPERTY_TYPE(int value, String code, String description,String classPath,Class clzFullName, + PROPERTY_CONTROL_TYPE controlType,SQL_WHERE defaultWhere,String defaultValue,String defaultFormat) { + this.value = value; + this.code = code; + this.description = description; + this.classPath = classPath; + this.clzFullName = clzFullName; + this.controlType = controlType; + this.defaultWhere = defaultWhere; + this.defaultValue = defaultValue; + this.defaultFormat = defaultFormat; } public int getValue() { @@ -1249,6 +1282,14 @@ public class BlockFormEnumUtil { return defaultWhere; } + public String getDefaultFormat() { + return defaultFormat; + } + + public String getDefaultValue() { + return defaultValue; + } + public static String valueOfCode(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -2379,7 +2420,8 @@ public class BlockFormEnumUtil { LIKE(7, "LIKE", "全模糊"), START_LIKE(7, "LIKE", "前模糊"), END_LIKE(7, "LIKE", "后模糊"), - IN(8, "in", "in"); + IN(8, "in", "in"), + BETWEEN(9, "BETWEEN", "区间查询(逗号区分)"),; private int value; private String code; From dc78cf114f4573f6d72a5f70ac8a6b8874d32e38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 14:20:24 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/softswitch/bean/BsDataSource.java | 63 ++++++++++++++++ .../pojo/softswitch/bean/BsDataSourceSuitCase.java | 47 ++++++++++++ .../softswitch/bean/BsDataSourceSuitCaseTable.java | 55 ++++++++++++++ .../pojo/softswitch/bean/BsMessageQueue.java | 51 +++++++++++++ .../pojo/softswitch/bean/BsParamAdapter.java | 67 +++++++++++++++++ .../pojo/softswitch/bean/BsSocketSuitCase.java | 39 ++++++++++ .../i3plus/pojo/softswitch/bean/BsSslKey.java | 67 +++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitCase.java | 87 ++++++++++++++++++++++ .../pojo/softswitch/bean/BsSuitCaseParam.java | 55 ++++++++++++++ .../pojo/softswitch/bean/BsSuitDataDetail.java | 67 +++++++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitRecord.java | 87 ++++++++++++++++++++++ .../pojo/softswitch/bean/BsSuitRequestRecord.java | 47 ++++++++++++ .../pojo/softswitch/bean/BsSuitSchedule.java | 47 ++++++++++++ .../i3plus/pojo/softswitch/bean/BsSuitType.java | 39 ++++++++++ .../pojo/softswitch/bean/SuitRecordParam.java | 43 +++++++++++ 15 files changed, 861 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java 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 new file mode 100644 index 0000000..db7474f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java @@ -0,0 +1,63 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE") +@Api(value = "数据源管理", description = "数据源管理") +public class BsDataSource extends BaseBean { + + @Column(name = "DATA_SOURCE_NAME") + @ApiParam(value = "数据源名称") + private String dataSourceName; + + @Column(name = "DATA_SOURCE_TYPE_ID") + @ApiParam(value = "数据源类型id") + private int dataSourceTypeId; + + @Column(name = "DATA_SOURCE_HOST") + @ApiParam(value = "数据源主机") + private String dataSourceHost; + + @Column(name = "DATA_SOURCE_PORT") + @ApiParam(value = "数据源端口") + private int dataSourcePort; + + @Column(name = "DATA_SOURCE_USER") + @ApiParam(value = "用户名") + private String dataSourceUser; + + @Column(name = "DATA_SOURCE_PASSWORD") + @ApiParam(value = "密码") + private String dataSourcePassword; + + @Column(name = "DATA_SOURCE_DESCRIPTION") + @ApiParam(value = "数据源用户描述") + private String dataSourceDescription; + + @Column(name = "CERTIFICATE_ID") + @ApiParam(value = "证书id") + private long certificateId; + +} + 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/BsDataSourceSuitCase.java new file mode 100644 index 0000000..7d110cd --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java @@ -0,0 +1,47 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE_SUIT_CASE") +@Api(value = "数据库套件", description = "数据库套件") +public class BsDataSourceSuitCase extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "DATA_SOURCE_MODE_ID") + @ApiParam(value = "数据源套件模式（枚举，被动读，主动写）") + private int dataSourceModeId; + + @Column(name = "DATA_SOURCE_ID") + @ApiParam(value = "数据源id") + private long dataSourceId; + + @Column(name = "DATA_SOURCE_ID_RDD") + @ApiParam(value = "数据源名称") + private String dataSourceIdRdd; + +} + 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/BsDataSourceSuitCaseTable.java new file mode 100644 index 0000000..fac9121 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java @@ -0,0 +1,55 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") +@Api(value = "数据库表操作", description = "数据库表操作") +public class BsDataSourceSuitCaseTable extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "TABLE_NAME") + @ApiParam(value = "数据库表名") + private String tableName; + + @Column(name = "QUERY_SQL") + @ApiParam(value = "查询sql") + private String querySql; + + @Column(name = "AFTER_QUERY_SQL") + @ApiParam(value = "查询后操作sql") + private String afterQuerySql; + + @Column(name = "INSERT_SQL") + @ApiParam(value = "插入sql") + private String insertSql; + + @Column(name = "AFTER_INSERT_SQL") + @ApiParam(value = "插入后执行sql") + private String afterInsertSql; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java new file mode 100644 index 0000000..88c70d5 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsMessageQueue.java @@ -0,0 +1,51 @@ +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 : MQ管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_MESSAGE_QUEUE") +@Api(value = "MQ管理", description = "MQ管理") +public class BsMessageQueue extends BaseBean { + + @Column(name = "MESSAGE_QUEUE_NAME") + @ApiParam(value = "消息队列名称") + private String messageQueueName; + + @Column(name = "MESSAGE_QUEUE_TYPE") + @ApiParam(value = "消息队列类型") + private int messageQueueType; + + @Column(name = "MESSAGE_QUEUE_HOST") + @ApiParam(value = "消息队列主机") + private String messageQueueHost; + + @Column(name = "MESSAGE_QUEUE_PORT") + @ApiParam(value = "消息队列端口") + private int messageQueuePort; + + @Column(name = "CERTIFICATE_ID") + @ApiParam(value = "证书id") + private long certificateId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java new file mode 100644 index 0000000..8885ba1 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsParamAdapter.java @@ -0,0 +1,67 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_PARAM_ADAPTER") +@Api(value = "数据适配转换", description = "数据适配转换") +public class BsParamAdapter extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_NAME") + @ApiParam(value = "适配套件名称") + private String suitCaseName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配套件代码") + private String suitCaseCode; + + @Column(name = "SUIT_PARAM_TYPE_ID") + @ApiParam(value = "参数类型枚举") + private int suitParamTypeId; + + @Column(name = "SUIT_PARAM_ID") + @ApiParam(value = "原参数id") + private long suitParamId; + + @Column(name = "SUIT_PARAM_NAME_RDD") + @ApiParam(value = "参数名称") + private String suitParamNameRdd; + + @Column(name = "SUIT_PARAM_VAL_TYPE_ID") + @ApiParam(value = "原参数值类型") + private int suitParamValTypeId; + + @Column(name = "TRANSFER_PARAM_NAME") + @ApiParam(value = "转换参数名称") + private String transferParamName; + + @Column(name = "TRANSFER_PARAM_VAL_TYPE_ID") + @ApiParam(value = "转换参数类型") + private int transferParamValTypeId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java new file mode 100644 index 0000000..f7e0858 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSocketSuitCase.java @@ -0,0 +1,39 @@ +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 : socket套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SOCKET_SUIT_CASE") +@Api(value = "socket套件", description = "socket套件") +public class BsSocketSuitCase extends BaseBean { + + @Column(name = "SOCKET_TYPE_ID") + @ApiParam(value = "socket类型（枚举）") + private int socketTypeId; + + @Column(name = "SOCKET_MODE_ID") + @ApiParam(value = "socket模式(枚举,服务端，客户端)") + private int socketModeId; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java new file mode 100644 index 0000000..9a1f66f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSslKey.java @@ -0,0 +1,67 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SSL_KEY") +@Api(value = "安全证书", description = "安全证书") +public class BsSslKey extends BaseBean { + + @Column(name = "VERIFICATION_METHOD_ID") + @ApiParam(value = "认证方式(枚举)") + private int verificationMethodId; + + @Column(name = "VERIFICATION_URL") + @ApiParam(value = "认证url") + private String verificationUrl; + + @Column(name = "KEY_TYPE") + @ApiParam(value = "证书类型枚举") + private int keyType; + + @Column(name = "KEY_NAME") + @ApiParam(value = "证书名称") + private String keyName; + + @Column(name = "KEY_FILE_ID") + @ApiParam(value = "证书文件id") + private long keyFileId; + + @Column(name = "KEY_FILE_PATH") + @ApiParam(value = "证书文件路径") + private String keyFilePath; + + @Column(name = "KEY_FILE_NAME") + @ApiParam(value = "证书文件名称") + private String keyFileName; + + @Column(name = "KEY_CONTENT") + @ApiParam(value = "秘钥内容") + private String keyContent; + + @Column(name = "KEY_DESCRIPTION") + @ApiParam(value = "证书描述") + private String keyDescription; + +} + 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 new file mode 100644 index 0000000..875adb3 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -0,0 +1,87 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE") +@Api(value = "适配套件", description = "适配套件") +public class BsSuitCase extends BaseBean { + + @Column(name = "CASE_TYPE_ID") + @ApiParam(value = "套件类型id(枚举)") + private int caseTypeId; + + @Column(name = "CASE_DETAIL_ID") + @ApiParam(value = "适配器明细id") + private long caseDetailId; + + @Column(name = "SUIT_TYPE_ID") + @ApiParam(value = "适配类型id") + private long suitTypeId; + + @Column(name = "SUIT_TYPE_NAME") + @ApiParam(value = "适配类型名称") + private String suitTypeName; + + @Column(name = "SUIT_CASE_CODE") + @ApiParam(value = "适配器代码") + private String suitCaseCode; + + @Column(name = "SUIT_CASE_HOST") + @ApiParam(value = "适配主机") + private String suitCaseHost; + + @Column(name = "SUIT_CASE_PORT") + @ApiParam(value = "适配端口") + private int suitCasePort; + + @Column(name = "IS_NEED_CERTIFICATION") + @ApiParam(value = "是否需要认证") + private int isNeedCertification; + + @Column(name = "CERTIFICATE_ID") + @ApiParam(value = "证书id") + private long certificateId; + + @Column(name = "TIMING_SUIT_NUM") + @ApiParam(value = "定时适配次数") + private int timingSuitNum; + + @Column(name = "INITIATIVE_SUIT_NUM") + @ApiParam(value = "主动适配测试") + private int initiativeSuitNum; + + @Column(name = "SUCCESS_NUM") + @ApiParam(value = "成功次数") + private int successNum; + + @Column(name = "FAIL_NUM") + @ApiParam(value = "失败次数") + private int failNum; + + @Column(name = "SUIT_CASE_DESCRIPTION") + @ApiParam(value = "适配类型描述") + private String suitCaseDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java new file mode 100644 index 0000000..74ac472 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -0,0 +1,55 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_CASE_PARAM") +@Api(value = "适配器出入参", description = "适配器出入参") +public class BsSuitCaseParam extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "套件id") + private long suitCaseId; + + @Column(name = "PARAM_TYPE_ID") + @ApiParam(value = "参数类型，枚举(出,入)") + private int paramTypeId; + + @Column(name = "PARAM_NAME") + @ApiParam(value = "参数名称)") + private String paramName; + + @Column(name = "PARAM_VAL_TYPE_ID") + @ApiParam(value = "参数值类型") + private int paramValTypeId; + + @Column(name = "PARAM_DEFAULT_VAL") + @ApiParam(value = "参数默认值") + private String paramDefaultVal; + + @Column(name = "PARAM_DESCRIPTION") + @ApiParam(value = "参数描述") + private String paramDescription; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java new file mode 100644 index 0000000..f827b7f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitDataDetail.java @@ -0,0 +1,67 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_DATA_DETAIL") +@Api(value = "适配报文详情", description = "适配报文详情") +public class BsSuitDataDetail extends BaseBean { + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "适配套件代码") + private String suitCaseCodeRdd; + + @Column(name = "SUIT_TYPE_NAME_RDD") + @ApiParam(value = "适配类型名称") + private String suitTypeNameRdd; + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "GET_DATE_TIME") + @ApiParam(value = "获取报文时间") + private String getDateTime; + + @Column(name = "ORGIN_DATA") + @ApiParam(value = "原始报文数据") + private String orginData; + + @Column(name = "TRANS_DATA") + @ApiParam(value = "转换后的报文数据") + private String transData; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private int processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} + 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 new file mode 100644 index 0000000..67d398b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java @@ -0,0 +1,87 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_RECORD") +@Api(value = "适配记录", description = "适配记录") +public class BsSuitRecord extends BaseBean { + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "适配套件代码") + private String suitCaseCodeRdd; + + @Column(name = "SUIT_CASE_TYPE") + @ApiParam(value = "适配套件类型id枚举") + private int suitCaseType; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配器套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_DETAIL_ID") + @ApiParam(value = "适配套件明细id") + private long suitCaseDetailId; + + @Column(name = "SUIT_METHOD_ID") + @ApiParam(value = "适配方式id枚举") + private int suitMethodId; + + @Column(name = "SUIT_TYPE_ID") + @ApiParam(value = "适配类型id") + private long suitTypeId; + + @Column(name = "SUIT_TYPE_NAME_RDD") + @ApiParam(value = "适配类型名称") + private String suitTypeNameRdd; + + @Column(name = "REQUEST_SOURCE") + @ApiParam(value = "请求来源(枚举)") + private int requestSource; + + @Column(name = "SUIT_SSL_KEY_ID") + @ApiParam(value = "证书id") + private long suitSslKeyId; + + @Column(name = "SUIT_SSL_KEY_NAME_RDD") + @ApiParam(value = "证书名称") + private String suitSslKeyNameRdd; + + @Column(name = "SUIT_RESULT") + @ApiParam(value = "适配结果") + private int suitResult; + + @Column(name = "PROCESS_STATE") + @ApiParam(value = "处理状态") + private int processState; + + @Column(name = "PROCESS_TIME") + @ApiParam(value = "处理时间") + private String processTime; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java new file mode 100644 index 0000000..331c11f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRequestRecord.java @@ -0,0 +1,47 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_REQUEST_RECORD") +@Api(value = "请求适配记录", description = "请求适配记录") +public class BsSuitRequestRecord extends BaseBean { + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配器套件id") + private long suitCaseId; + + @Column(name = "REQUEST_SOURCE") + @ApiParam(value = "请求来源(枚举)") + private int requestSource; + + @Column(name = "REQUEST_ORGIN_PARAM") + @ApiParam(value = "请求原始参数") + private String requestOrginParam; + +} + 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 new file mode 100644 index 0000000..4b657d3 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitSchedule.java @@ -0,0 +1,47 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_SCHEDULE") +@Api(value = "定时适配任务", description = "定时适配任务") +public class BsSuitSchedule extends BaseBean { + + @Column(name = "SUIT_CASE_ID") + @ApiParam(value = "适配套件id") + private long suitCaseId; + + @Column(name = "SUIT_CASE_NAME_RDD") + @ApiParam(value = "适配套件名称") + private String suitCaseNameRdd; + + @Column(name = "EXECUTE_CRON") + @ApiParam(value = "执行时间表达式") + private String executeCron; + + @Column(name = "LAST_EXECUTE_DATE_TIME") + @ApiParam(value = "最后一次执行时间") + private String lastExecuteDateTime; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java new file mode 100644 index 0000000..576c4f1 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitType.java @@ -0,0 +1,39 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "BS_SUIT_TYPE") +@Api(value = "适配类型", description = "适配类型") +public class BsSuitType extends BaseBean { + + @Column(name = "SUIT_TYPE_NAME") + @ApiParam(value = "适配类型") + private String suitTypeName; + + @Column(name = "SUIT_CASE_NUM") + @ApiParam(value = "适配器数量") + private int suitCaseNum; + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java new file mode 100644 index 0000000..5f0bb46 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/SuitRecordParam.java @@ -0,0 +1,43 @@ +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 : 2019-08-13 9:21 + * @Modify: + */ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "SUIT_RECORD_PARAM") +@Api(value = "适配记录参数", description = "适配记录参数") +public class SuitRecordParam extends BaseBean { + + @Column(name = "SUIT_RECORD_ID") + @ApiParam(value = "适配记录id") + private long suitRecordId; + + @Column(name = "PARAM_NAME") + @ApiParam(value = "参数名称") + private String paramName; + + @Column(name = "PARAM_VAL") + @ApiParam(value = "参数值") + private String paramVal; + +} + From f82011cf5bbbfebf30f0c910a8357c98c558c50c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 14:37:31 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../softswitch/repository/BsDataSourceRepository.java | 16 ++++++++++++++++ .../repository/BsDataSourceSuitCaseRepository.java | 16 ++++++++++++++++ .../repository/BsDataSourceSuitCaseTableRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsMessageQueueRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsParamAdapterRepository.java | 16 ++++++++++++++++ .../repository/BsSocketSuitCaseRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSslKeyRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitCaseParamRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSuitCaseRepository.java | 16 ++++++++++++++++ .../repository/BsSuitDataDetailRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitRecordRepository.java | 16 ++++++++++++++++ .../repository/BsSuitRequestRecordRepository.java | 16 ++++++++++++++++ .../softswitch/repository/BsSuitScheduleRepository.java | 16 ++++++++++++++++ .../pojo/softswitch/repository/BsSuitTypeRepository.java | 16 ++++++++++++++++ .../softswitch/repository/SuitRecordParamRepository.java | 16 ++++++++++++++++ 15 files changed, 240 insertions(+) create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java create mode 100644 modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java new file mode 100644 index 0000000..0bdd817 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据源管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsDataSourceRepository extends BaseRepository { + +} + 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 new file mode 100644 index 0000000..fbd7a50 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据库套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +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 new file mode 100644 index 0000000..532fe5b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceSuitCaseTableRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据库表操作 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java new file mode 100644 index 0000000..0a5be4b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : MQ管理 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsMessageQueueRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java new file mode 100644 index 0000000..ff6078a --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 数据适配转换 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsParamAdapterRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java new file mode 100644 index 0000000..a2b2e1f --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : socket套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSocketSuitCaseRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java new file mode 100644 index 0000000..ed13fa4 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 安全证书 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSslKeyRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java new file mode 100644 index 0000000..49ad6c4 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配器出入参 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitCaseParamRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java new file mode 100644 index 0000000..8a76054 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配套件 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitCaseRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java new file mode 100644 index 0000000..4230fb5 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配报文详情 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitDataDetailRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java new file mode 100644 index 0000000..a98d63e --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitRecordRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java new file mode 100644 index 0000000..687c3ec --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 请求适配记录 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitRequestRecordRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java new file mode 100644 index 0000000..ea4a12b --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 定时适配任务 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitScheduleRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java new file mode 100644 index 0000000..ec9376a --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配类型 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface BsSuitTypeRepository extends BaseRepository { + +} + diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java new file mode 100644 index 0000000..b9eb3b6 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.softswitch.repository; + +import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description : 适配记录参数 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:21 + * @Modify: + */ +public interface SuitRecordParamRepository extends BaseRepository { + +} + From 7455c6c64069766e8b30c0bcfab8e131b98a5eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 16:24:39 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java | 11 +++++++++++ .../cn/estsh/i3plus/pojo/softswitch/bean/BsDataSource.java | 4 ---- .../i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java | 4 ++-- .../{SoftswitchHqlPack.java => SoftSwitchHqlPack.java} | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java rename modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/{SoftswitchHqlPack.java => SoftSwitchHqlPack.java} (96%) 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/SoftSwitchEnumUtil.java new file mode 100644 index 0000000..d0bc317 --- /dev/null +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/SoftSwitchEnumUtil.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.base.enumutil; + +/** + * @Description : 软适配 枚举接口 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-08-13 9:34 + * @Modify: + **/ +public class SoftSwitchEnumUtil { +} 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 db7474f..128e256 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 @@ -55,9 +55,5 @@ public class BsDataSource extends BaseBean { @ApiParam(value = "数据源用户描述") private String dataSourceDescription; - @Column(name = "CERTIFICATE_ID") - @ApiParam(value = "证书id") - private long certificateId; - } 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/BsDataSourceSuitCase.java index 7d110cd..e4e9d3c 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/BsDataSourceSuitCase.java @@ -39,9 +39,9 @@ public class BsDataSourceSuitCase extends BaseBean { @ApiParam(value = "数据源id") private long dataSourceId; - @Column(name = "DATA_SOURCE_ID_RDD") + @Column(name = "DATA_SOURCE_NAME_RDD") @ApiParam(value = "数据源名称") - private String dataSourceIdRdd; + private String dataSourceNameRdd; } 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 similarity index 96% rename from modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftswitchHqlPack.java rename to modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java index 9230fc5..6d2a268 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 @@ -11,7 +11,7 @@ import org.apache.commons.lang3.StringUtils; * @CreateDate : 2019-02-28 16:05 * @Modify: **/ -public class SoftswitchHqlPack { +public class SoftSwitchHqlPack { /** From 05b9298dec077c02917c68a3a73df8859e22c09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 13 Aug 2019 17:57:21 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8DRepository?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/softswitch/bean/BsSuitCaseParam.java | 4 ++++ .../repository/BsDataSourceRepository.java | 6 ++++-- .../repository/BsDataSourceSuitCaseRepository.java | 6 ++++-- .../BsDataSourceSuitCaseTableRepository.java | 6 ++++-- .../repository/BsMessageQueueRepository.java | 6 ++++-- .../repository/BsParamAdapterRepository.java | 7 +++++-- .../repository/BsSocketSuitCaseRepository.java | 6 ++++-- .../softswitch/repository/BsSslKeyRepository.java | 6 ++++-- .../repository/BsSuitCaseParamRepository.java | 6 ++++-- .../softswitch/repository/BsSuitCaseRepository.java | 6 ++++-- .../repository/BsSuitDataDetailRepository.java | 6 ++++-- .../repository/BsSuitRecordRepository.java | 6 ++++-- .../repository/BsSuitRequestRecordRepository.java | 6 ++++-- .../repository/BsSuitScheduleRepository.java | 6 ++++-- .../softswitch/repository/BsSuitTypeRepository.java | 6 ++++-- .../repository/SuitRecordParamRepository.java | 6 ++++-- .../repository/TestDataBaseRepository.java | 2 ++ .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 20 +++++++++++++++++++- 18 files changed, 86 insertions(+), 31 deletions(-) diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java index 74ac472..310bdc5 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java @@ -31,6 +31,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "套件id") private long suitCaseId; + @Column(name = "SUIT_CASE_CODE_RDD") + @ApiParam(value = "套件代码") + private String suitCaseCodeRdd; + @Column(name = "PARAM_TYPE_ID") @ApiParam(value = "参数类型，枚举(出,入)") private int paramTypeId; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java index 0bdd817..7896c2e 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsDataSourceRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSource; +import org.springframework.stereotype.Repository; /** * @Description : 数据源管理 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsDataSourceRepository extends BaseRepository { } 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 fbd7a50..eadac50 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,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCase; +import org.springframework.stereotype.Repository; /** * @Description : 数据库套件 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository 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 532fe5b..16100db 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,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsDataSourceSuitCaseTable; +import org.springframework.stereotype.Repository; /** * @Description : 数据库表操作 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsDataSourceSuitCaseTableRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java index 0a5be4b..0ff1087 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsMessageQueueRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsMessageQueue; +import org.springframework.stereotype.Repository; /** * @Description : MQ管理 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsMessageQueueRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java index ff6078a..055a2d0 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsParamAdapterRepository.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsParamAdapter; +import org.springframework.stereotype.Repository; /** * @Description : 数据适配转换 @@ -9,7 +11,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsParamAdapterRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java index a2b2e1f..8672634 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSocketSuitCaseRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; +import org.springframework.stereotype.Repository; /** * @Description : socket套件 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSocketSuitCaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java index ed13fa4..5549947 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSslKeyRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; +import org.springframework.stereotype.Repository; /** * @Description : 安全证书 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSslKeyRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java index 49ad6c4..50a9e02 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseParamRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; +import org.springframework.stereotype.Repository; /** * @Description : 适配器出入参 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitCaseParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java index 8a76054..79495df 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; +import org.springframework.stereotype.Repository; /** * @Description : 适配套件 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitCaseRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java index 4230fb5..ada687c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitDataDetailRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitDataDetail; +import org.springframework.stereotype.Repository; /** * @Description : 适配报文详情 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitDataDetailRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java index a98d63e..add963c 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRecordRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord; +import org.springframework.stereotype.Repository; /** * @Description : 适配记录 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitRecordRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java index 687c3ec..74c9fb4 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitRequestRecordRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRequestRecord; +import org.springframework.stereotype.Repository; /** * @Description : 请求适配记录 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitRequestRecordRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java index ea4a12b..5e6b472 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitScheduleRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitSchedule; +import org.springframework.stereotype.Repository; /** * @Description : 定时适配任务 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitScheduleRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java index ec9376a..e2f0aa7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitTypeRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitType; +import org.springframework.stereotype.Repository; /** * @Description : 适配类型 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface BsSuitTypeRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java index b9eb3b6..e2b4a0b 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/SuitRecordParamRepository.java @@ -1,7 +1,8 @@ package cn.estsh.i3plus.pojo.softswitch.repository; -import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.softswitch.bean.SuitRecordParam; +import org.springframework.stereotype.Repository; /** * @Description : 适配记录参数 @@ -9,7 +10,8 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; * @Author : yunhao * @CreateDate : 2019-08-13 9:21 * @Modify: - */ + */ +@Repository public interface SuitRecordParamRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java index 3cf2b11..91de0d7 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/TestDataBaseRepository.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.softswitch.repository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; +import org.springframework.stereotype.Repository; /** * @Description : @@ -10,5 +11,6 @@ import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; * @CreateDate : 2019-02-28 15:48 * @Modify: **/ +@Repository public interface TestDataBaseRepository 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 6d2a268..66e905f 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 @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.softswitch.sqlpack; +import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; +import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam; import cn.estsh.i3plus.pojo.softswitch.bean.TestDataBase; import org.apache.commons.lang3.StringUtils; @@ -13,7 +16,6 @@ import org.apache.commons.lang3.StringUtils; **/ public class SoftSwitchHqlPack { - /** * In 参数封装 * @param columnName @@ -41,4 +43,20 @@ public class SoftSwitchHqlPack { return result.toString(); } + /** + * 适配套件参数条件封装 + * @param bsSuitCaseParam 查询条件 + * @return + */ + public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + + return ddlPackBean; + } + } From 42f067b98773dc67c694062b5f22cb583e2719b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 14 Aug 2019 10:06:02 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 66e905f..c00091f 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 @@ -56,6 +56,23 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitCaseParam.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean); + ddlPackBean.setOrderByStr(bsSuitCaseParam.orderBy()); + + return ddlPackBean; + } + + /** + * 适配套件参数唯一校验 + * @param bsSuitCaseParam 适配套件参数信息 + * @return + */ + public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){ + DdlPackBean ddlPackBean = new DdlPackBean(); + + DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); + return ddlPackBean; } From 409c433b5c4d54d5d86946f4d61b9c4de555953c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 14 Aug 2019 10:12:25 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=86=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 2d777b9..df4aba7 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -801,14 +801,14 @@ public class CoreHqlPack { * @param ids * @return */ - public static String packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryByIdsAndIsDefault(Long[] ids) { + DdlPackBean result = new DdlPackBean(); // hql拼接 - HqlPack.getInPack(StringUtils.join(ids,","),"id",result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); + DdlPreparedPack.getInPack(StringUtils.join(ids,","),"id",result); + DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isDefault",result); - return result.toString(); + return result; } /** From 9ff9c11c9797ffb69e3de0a478ff4069f230b4af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 14 Aug 2019 17:35:38 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java index c52ce23..3c493d7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java @@ -171,8 +171,8 @@ public class WmsMoveDetails extends BaseBean { } public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode - ,String transTypeName,Integer itemStatus,String unit,String srcWhNo, - String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo, + ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo, + String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo, Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){ this.organizeCode = organizeCode; this.partNo = partNo; @@ -184,10 +184,10 @@ public class WmsMoveDetails extends BaseBean { this.itemStatus = itemStatus; this.unit = unit; this.srcWhNo = srcWhNo; - this.srcZoneNo = srcZoneNo; - this.srcLocateNo = srcLocateNo; this.destWhNo = destWhNo; + this.srcZoneNo = srcZoneNo; this.destZoneNo = destZoneNo; + this.srcLocateNo = srcLocateNo; this.destLocateNo = destLocateNo; this.transQty = transQty; this.rejectQty = rejectQty; From 839c1392229b3b2f85a5ca5dd40e0d03ea97c1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com> Date: Thu, 15 Aug 2019 15:22:59 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java index 43edf65..f8d9e0e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java @@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean { } public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus, - Integer destSnStatus, String lotNo,String dateCode){ + Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){ this.organizeCode=organizeCode; this.orderNo=orderNo; this.item=item; @@ -232,6 +232,9 @@ public class WmsMoveSn extends BaseBean { this.destSnStatus=destSnStatus; this.lotNo=lotNo; this.dateCode=dateCode; + this.refSrc = refSrc; + this.destZoneNo = destZoneNo; + this.destWhNo =destWhNo; } }