From 21241e45ca476ec8f4a2c556725e42368fe893fa Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 10 Sep 2019 16:38:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 42 ++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 66e1dfc..1567e5b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -480,12 +480,12 @@ public class BlockSoftSwitchEnumUtil { } /** - * 适配方式 + * WebService Server 服务端命令 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_SERVER_WEB_SERVICE{ - ACTIVE(40001,"serverWebServiceHello","hello"), - SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试"); + ACTIVE(40002,"serverWebServiceHello","hello"), + SCHEDULE(40004,"serverWebServiceSendEmail","邮件测试"); private int value; private String description; @@ -516,4 +516,40 @@ public class BlockSoftSwitchEnumUtil { } } + /** + * WebService Server 服务端命令 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_SERVER_WEB_CLIENT{ + ACTIVE(40001,"softswitchClient","软适配服务邮件服务"); + + private int value; + private String description; + private String clazzName; + + SUIT_SERVER_WEB_CLIENT(int value, String clazzName,String description) { + this.value = value; + this.clazzName = clazzName; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } From 71798e9f51a92a0de57e520e039c23b3cc15cd49 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 10 Sep 2019 17:19:01 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 49 ++++++---------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 1567e5b..fd3ddbd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -379,8 +379,8 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_MODE{ - ACTIVE(1,"客户端"), - PASSIVE(2,"服务端"); + CLIENT(1,"客户端"), + SERVER(2,"服务端"); private int value; private String description; @@ -484,17 +484,19 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_SERVER_WEB_SERVICE{ - ACTIVE(40002,"serverWebServiceHello","hello"), - SCHEDULE(40004,"serverWebServiceSendEmail","邮件测试"); + SCHEDULE(40001,"serverWebServiceSendEmail","邮件测试",SUIT_MODE.SERVER), + ACTIVE(40002,"softswitchClient","软适配服务邮件服务",SUIT_MODE.CLIENT); private int value; private String description; private String clazzName; + private SUIT_MODE mode; - SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description) { + SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description,SUIT_MODE mode) { this.value = value; this.clazzName = clazzName; this.description = description; + this.mode = mode; } public int getValue() { @@ -505,40 +507,12 @@ public class BlockSoftSwitchEnumUtil { return description; } - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** - * WebService Server 服务端命令 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_SERVER_WEB_CLIENT{ - ACTIVE(40001,"softswitchClient","软适配服务邮件服务"); - - private int value; - private String description; - private String clazzName; - - SUIT_SERVER_WEB_CLIENT(int value, String clazzName,String description) { - this.value = value; - this.clazzName = clazzName; - this.description = description; + public String getClazzName() { + return clazzName; } - public int getValue() { - return value; - } - - public String getDescription() { - return description; + public SUIT_MODE getMode() { + return mode; } public static String valueOfDescription(int val) { @@ -552,4 +526,5 @@ public class BlockSoftSwitchEnumUtil { } } + } From 2c6b223628a238a09dc1c6fc86dc1f7f99fb3ab8 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 15:57:07 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/enumutil/BlockSoftSwitchEnumUtil.java | 202 ++++++++++++--------- .../pojo/model/softswitch/BsSuitCaseModel.java | 13 +- .../{SuitCoreModel.java => SuitClientModel.java} | 73 +++----- .../pojo/softswitch/bean/BsSuitCaseParam.java | 4 + 4 files changed, 155 insertions(+), 137 deletions(-) rename modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/{SuitCoreModel.java => SuitClientModel.java} (56%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 2c17fa4..b1d8e56 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -3,6 +3,9 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; import org.apache.commons.lang3.StringUtils; +import java.util.ArrayList; +import java.util.List; + /** * @Description : 软适配 枚举接口 * @Reference : @@ -20,9 +23,9 @@ public class BlockSoftSwitchEnumUtil { SOCKET(10,"SOCKET"), RESTFUL(20,"RESTFUL"), DATASOURCE(30,"数据源"), - WEBSERVICE(40,"WebService"), + WEB_SERVICE(40,"WebService"), MQ(50,"消息队列"), - WebSocket(60,"WebSocket"); + WEB_SOCKET(60,"WebSocket"); private int value; private String description; @@ -62,13 +65,123 @@ public class BlockSoftSwitchEnumUtil { } /** + * 适配模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SUIT_MODE{ + CLIENT(1,"客户端"), + SERVER(2,"服务端"); + + private int value; + private String description; + + SUIT_MODE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * 软适配命令集合 + * + *
ID 编号规则 + *
第一位 服务端或者客户端 1 或者 2 + *
第二至三位 适配类型编号 + *
后三位 适配器ID升序 + * + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SOFTS_WITCH_ACTION{ + /* WebService */ + SERVER_WEB_SERVICE_SEND_EMAIL(SUIT_MODE.SERVER,CASE_TYPE.WEB_SERVICE,240001,"serverWebServiceSendEmail","软适配服务邮件服务"), + CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), + + /* 数据源 */ + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"); + + private int value; + private String description; + private String clazzName; + private SUIT_MODE mode; + private CASE_TYPE type; + + SOFTS_WITCH_ACTION(SUIT_MODE mode, CASE_TYPE type,int value, String clazzName, String description) { + this.value = value; + this.description = description; + this.clazzName = clazzName; + this.mode = mode; + this.type = type; + } + + public static SOFTS_WITCH_ACTION valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + return values()[i]; + } + } + return null; + } + + public static SOFTS_WITCH_ACTION[] valueOfCaseType(CASE_TYPE type) { + List result = new ArrayList<>(); + for (int i = 0; i < values().length; i++) { + if (values()[i].type.equals(type)) { + result.add(values()[i]); + } + } + return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getClazzName() { + return clazzName; + } + + public SUIT_MODE getMode() { + return mode; + } + + public CASE_TYPE getType() { + return type; + } + } + + /** * 请求来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REQUEST_SOURCE{ ACTIVE(1,"主动请求"), SCHEDULE(2,"定时调度"), - RABBITMQ(3,"MQ 调用"); + RABBITMQ(3,"MQ 调用"), + HTTP(4,"接口调用"), + CLOUD(5,"Cloud调用"); private int value; private String description; @@ -385,41 +498,6 @@ public class BlockSoftSwitchEnumUtil { } /** - * 适配模式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_MODE{ - CLIENT(1,"客户端"), - SERVER(2,"服务端"); - - private int value; - private String description; - - SUIT_MODE(int value, String description) { - this.value = value; - this.description = description; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - /** * 适配方式 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -489,52 +567,4 @@ public class BlockSoftSwitchEnumUtil { } } - /** - * WebService Server 服务端命令 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SUIT_SERVER_WEB_SERVICE{ - SCHEDULE(40001,"serverWebServiceSendEmail","邮件测试",SUIT_MODE.SERVER), - ACTIVE(40002,"softswitchClient","软适配服务邮件服务",SUIT_MODE.CLIENT); - - private int value; - private String description; - private String clazzName; - private SUIT_MODE mode; - - SUIT_SERVER_WEB_SERVICE(int value, String clazzName,String description,SUIT_MODE mode) { - this.value = value; - this.clazzName = clazzName; - this.description = description; - this.mode = mode; - } - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - public String getClazzName() { - return clazzName; - } - - public SUIT_MODE getMode() { - return mode; - } - - public static String valueOfDescription(int val) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].value == val) { - tmp = values()[i].description; - } - } - return tmp; - } - } - - } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 6b33f85..cb95189 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,5 @@ package cn.estsh.i3plus.pojo.model.softswitch; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; @@ -9,7 +7,7 @@ import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; +import java.io.Serializable; /** * @Description : 适配器model @@ -19,7 +17,8 @@ import javax.persistence.Transient; * @Modify: **/ @Data -public class BsSuitCaseModel { +public class BsSuitCaseModel implements Serializable { + private static final long serialVersionUID = -7420782744192475445L; @ApiParam(value = "适配器") private BsSuitCase bsSuitCase; @@ -32,4 +31,10 @@ public class BsSuitCaseModel { @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + public BsSuitCaseModel() { + } + + public BsSuitCaseModel(BsSuitCase bsSuitCase) { + this.bsSuitCase = bsSuitCase; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java similarity index 56% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java index 2283d83..b668b4f 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java @@ -1,17 +1,14 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSslKey; -import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamOmitField; +import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Transient; - /** * @Description : * @Reference : @@ -21,89 +18,74 @@ import javax.persistence.Transient; **/ @Data @XStreamAlias("model") -public class SuitCoreModel { +public class SuitClientModel { /** * 适配套件代码 */ @XStreamAsAttribute - private String suitCaseCode;// adapterId + private String suitCaseCode; + + @ApiParam(value = "套件类型(枚举)") + @XStreamAsAttribute + private Integer caseTypeId; + + @ApiParam(value = "适配命令(枚举)") + private Integer suitServerActionId; /** - * 套件类型 + * 适配器信息 */ - @XStreamAsAttribute - private Integer caseType; + private BsSuitCaseModel suitCaseModel; /** * 适配结果信息 */ private String suitMessage; - /** * 请求来源 */ private Integer requestSource; - - private String suitCaseStatusCode; - /** - * 适配认证 + * 适配状态码 */ - private BsSslKey sslKey; - + private String suitCaseStatusCode; /** * 认证令牌 */ private String token; - - /** - * 适配器套件 - */ - private BsSuitCase bsSuitCase; - - private Object bsSuitCaseDetail; - /** * 认证结果 */ private Integer suitSslKeyResult; - /** * 认证信息 */ private String suitSslKeyResultMessage; - /** * 适配结果 */ private Integer suitResult; - /** * 适配报文 */ @XStreamCDATA private String suitResultMessage; - /** - * @param requestSource 请求来源 - * @param sslKey 适配认证对象 - * @param bsSuitCase 适配器信息 - */ - public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){ - this(requestSource,sslKey, bsSuitCase,null); + public SuitClientModel() { } - public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) { - this.sslKey = sslKey; - this.bsSuitCase = bsSuitCase; + public SuitClientModel(BlockSoftSwitchEnumUtil.REQUEST_SOURCE source, BsSuitCaseModel suitCaseModel) { + new SuitClientModel(source.getValue(),suitCaseModel); + } + + public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) { this.requestSource = requestSource; - this.bsSuitCaseDetail = bsSuitCaseDetail; - // 设置套件类型 - this.caseType = bsSuitCase.getCaseTypeId(); - // 设置套件代码 - this.suitCaseCode = bsSuitCase.getSuitCaseCode(); + this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId(); + this.suitServerActionId = suitCaseModel.getBsSuitCase().getSuitServerActionId(); + this.suitCaseModel = suitCaseModel; + // 设置默认 this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode(); // 设置默认 @@ -111,7 +93,4 @@ public class SuitCoreModel { // 设置默认 this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(); } -} - - - +} \ No newline at end of file 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 148494f..0c4f5b1 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 @@ -51,6 +51,10 @@ public class BsSuitCaseParam extends BaseBean { @ApiParam(value = "参数值类型") private Integer paramValTypeId; + @Column(name = "PARAM_SORT") + @ApiParam(value = "参数参数排序") + private Integer paramSort; + @Column(name = "PARAM_DEFAULT_VALUE") @ApiParam(value = "参数默认值") private String paramDefaultValue; From 8b0e851eb8071ebe1ed4310a447ade135a473989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Sep 2019 15:58:29 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=A5=97=E4=BB=B6=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 4 ++++ .../cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 6b33f85..9d3f049 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.model.softswitch; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; @@ -29,7 +30,10 @@ public class BsSuitCaseModel { @ApiParam(value = "socket适配套件") private BsSocketSuitCase bsSocketSuitCase; + @ApiParam(value = "Web Service 适配套件") private BsSuitCaseWebService webService; + @ApiParam(value = "分页数据") + private Pager pager; } 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 629fcf7..71d1c59 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 @@ -118,6 +118,7 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsParamAdapter.orderBy()); From fc1c7ab797483670c1298d007cd2caf1484eed21 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 16:06:51 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0-=E6=89=80=E6=9C=89=E9=80=82=E9=85=8D=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 10 ++++++++++ .../cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java | 2 -- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index b1d8e56..cc6a524 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -151,6 +151,16 @@ public class BlockSoftSwitchEnumUtil { return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); } + public static SOFTS_WITCH_ACTION[] valueOfMode(SUIT_MODE mode) { + List result = new ArrayList<>(); + for (int i = 0; i < values().length; i++) { + if (values()[i].mode.equals(mode)) { + result.add(values()[i]); + } + } + return result.toArray(new SOFTS_WITCH_ACTION[result.size()]); + } + public int getValue() { return value; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java index b78b66f..d0a336e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -19,8 +19,6 @@ public class SuitServerModel { // 执行方法命令 private String action; - // 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE) - private Integer caseType; /* 认证使用 以后使用 */ private String token; // 传输单对象 From 377a875fec1df8806f35f5b93be756740f01b7ef Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 11 Sep 2019 16:31:06 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=BD=AF=E9=80=82=E9=85=8D=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 5 ++++- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index cc6a524..5fe61aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -115,7 +115,10 @@ public class BlockSoftSwitchEnumUtil { CLIENT_WEB_SERVICE_HELLO(SUIT_MODE.CLIENT,CASE_TYPE.WEB_SERVICE,140002,"serverWebServiceSendEmail","软适配服务邮件服务"), /* 数据源 */ - CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"); + CLIENT_DATA_SOURCE_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.DATASOURCE,130001,"imppDataSourceClient","软适配服务邮件服务"), + + /* Restful */ + CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"imppHttpRestfulClient","Restful Client Impp Test"); private int value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index bb4e11e..3b7894c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.model.softswitch; -import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; -import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource; From 40a2a789bee7a8963b27fe37a84b5a10757cb8b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 11 Sep 2019 17:00:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java | 2 +- .../java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java index 3b7894c..77b0134 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java @@ -25,7 +25,7 @@ public class BsSuitCaseModel implements Serializable { private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - private BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsSuitCaseDataSource; @ApiParam(value = "socket适配套件") private BsSocketSuitCase bsSocketSuitCase; 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 71d1c59..9377c97 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 @@ -116,7 +116,6 @@ public class SoftSwitchHqlPack { DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsParamAdapter.getSuitParamNameRdd(), "suitParamNameRdd", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitParamTypeId(), "suitParamTypeId", ddlPackBean);