I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

软适配客户端代码结构调整。

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent 212cfb02af
commit 2c6b223628
4 changed files with 155 additions and 137 deletions
Show Stats Download Patch File Download Diff File

202
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java
Unescape Escape View File

@ -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;
}
}
/**
* 软适配命令集合
* <per>
* <br/> ID 编号规则
* <br/> 第一位 服务端或者客户端 1 或者 2
* <br/> 第二至三位 适配类型编号
* <br/> 后三位 适配器ID升序
* </per>
*/
@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<SOFTS_WITCH_ACTION> 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;
}
}
}

13
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java
Unescape Escape View File

@ -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;
}
}

73
modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitCoreModel.java → modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java
Unescape Escape View File

@ -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();
}
}
}

4
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseParam.java
Unescape Escape View File

@ -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;

Write Preview
Loading…
Cancel
Save