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

Merge branch 'dev' into test

Browse Source
yun-zuoyi
crish 6 years ago
parent 39e0fbca80 726600fccd
commit 4a1ad40dfa
33 changed files with 674 additions and 282 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -48,7 +48,7 @@ public class AndonManageQueue extends BaseBean {
@Column(name = "ALARM_CODE") @Column(name = "ALARM_CODE")
@ApiParam(value = "安灯类型") @ApiParam(value = "安灯类型")
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "code",value = "description") @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
private String alarmCode; private String alarmCode;
@Column(name = "ACTION_CODE") @Column(name = "ACTION_CODE")

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/common/XStreamFactory.java
Unescape Escape View File

@ -60,7 +60,7 @@ public class XStreamFactory {
} }
}); });
xStream.setMode(XStream.NO_REFERENCES); // xStream.setMode(XStream.NO_REFERENCES);
xStream.autodetectAnnotations(true); xStream.autodetectAnnotations(true);
return xStream; return xStream;

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

@ -10,19 +10,19 @@ import org.apache.commons.lang3.StringUtils;
* @CreateDate : 2019-08-13 9:34 * @CreateDate : 2019-08-13 9:34
* @Modify: * @Modify:
**/ **/
public class SoftSwitchEnumUtil { public class BlockSoftSwitchEnumUtil {
/** /**
* 套件类型 * 套件类型
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum CASE_TYPE{ public enum CASE_TYPE{
SOCKET(1,"SOCKET"), SOCKET(10,"SOCKET"),
RESTFUL(2,"RESTFUL"), RESTFUL(20,"RESTFUL"),
DATASOURCE(3,"数据源"), DATASOURCE(30,"数据源"),
WEBSERVICE(4,"WebService"), WEBSERVICE(40,"WebService"),
MQ(5,"消息队列"), MQ(50,"消息队列"),
WebSocket(6,"WebSocket"); WebSocket(60,"WebSocket");
private int value; private int value;
private String description; private String description;
@ -57,7 +57,8 @@ public class SoftSwitchEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum REQUEST_SOURCE{ public enum REQUEST_SOURCE{
ACTIVE(1,"主动请求"), ACTIVE(1,"主动请求"),
SCHEDULE(2,"定时调度"); SCHEDULE(2,"定时调度"),
RABBITMQ(3,"MQ 调用");
private int value; private int value;
private String description; private String description;
@ -234,7 +235,7 @@ public class SoftSwitchEnumUtil {
return tmp; return tmp;
} }
public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) {
String tmp = null; String tmp = null;
for (int i = 0; i < values().length; i++) { for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) { if (values()[i].value == val) {
@ -267,7 +268,7 @@ public class SoftSwitchEnumUtil {
return null; return null;
} }
public static SoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){
if(StringUtils.isNotBlank(databaseProductName)){ if(StringUtils.isNotBlank(databaseProductName)){
if(databaseProductName.indexOf(":mysql:") != -1){ if(databaseProductName.indexOf(":mysql:") != -1){
return SOURCE_MARIA_DB; return SOURCE_MARIA_DB;
@ -304,11 +305,11 @@ public class SoftSwitchEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PARAM_VALUE_TYPE{ public enum PARAM_VALUE_TYPE{
NUM(1,"数字"), NUM(10,"数字"),
STRING(2,"字符串"), STRING(20,"字符串"),
BOOLEAN(3,"布尔"), BOOLEAN(30,"布尔"),
MAP(4,"字典"), MAP(40,"字典"),
LIST(5,"列表"); LIST(50,"列表");
private int value; private int value;
private String description; private String description;
@ -378,8 +379,8 @@ public class SoftSwitchEnumUtil {
*/ */
@JsonFormat(shape = JsonFormat.Shape.OBJECT) @JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SUIT_MODE{ public enum SUIT_MODE{
ACTIVE(1,"主动"), ACTIVE(1,"客户端"),
PASSIVE(2,"被动"); PASSIVE(2,"服务端");
private int value; private int value;
private String description; private String description;
@ -443,4 +444,76 @@ public class SoftSwitchEnumUtil {
} }
} }
/**
* 数据库操作方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATABASE_OPERATE_TYPE{
READ(1,"读取"),
WRITE(2,"写入");
private int value;
private String description;
DATABASE_OPERATE_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* 适配方式
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SUIT_SERVER_WEB_SERVICE{
ACTIVE(40001,"serverWebServiceHello","hello"),
SCHEDULE(40002,"serverWebServiceSendEmail","邮件测试");
private int value;
private String description;
private String clazzName;
SUIT_SERVER_WEB_SERVICE(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;
}
}
} }

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

@ -79,6 +79,10 @@ public class BfElement extends BaseBean {
@ApiParam(value = "是否删除") @ApiParam(value = "是否删除")
private Integer isObjectDel; private Integer isObjectDel;
@Column(name = "IS_OBJECT_EXPORT")
@ApiParam(value = "是否导出")
private Integer isObjectExport;
@Column(name="ELEMENT_SORT_ATTR_ID") @Column(name="ELEMENT_SORT_ATTR_ID")
@ApiParam(value ="默认排序属性") @ApiParam(value ="默认排序属性")
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)

6
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java
Unescape Escape View File

@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean {
@AnnoOutputColumn(hidden = true) @AnnoOutputColumn(hidden = true)
private BfDataObjectProperty objectProperty; private BfDataObjectProperty objectProperty;
public Object getFormValue() { // public Object getFormValue() {
return propertyFormValue; // return propertyFormValue == null ? propertyDefaultValue : propertyFormValue;
} // }
} }

2
modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/sqlpack/FormHqlPack.java
Unescape Escape View File

@ -341,6 +341,8 @@ public final class FormHqlPack {
DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result); DdlPreparedPack.getNegativeNumEqualPack(bfMenu.getId(), "parentId", result);
DdlPreparedPack.getNumEqualPack( DdlPreparedPack.getNumEqualPack(
CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result);
DdlPreparedPack.getNumEqualPack(
CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
// 按顺序字段进行排序 // 按顺序字段进行排序

7
modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java
Unescape Escape View File

@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述") @ApiParam("任务周期描述")
private String taskCycleDescription; private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
@Column(name="TASK_PARAM") @Column(name="TASK_PARAM")
@ApiParam("任务参数") @ApiParam("任务参数")
private String taskParam; private String taskParam;
@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
return this.taskType == null ? 0 : this.taskType; return this.taskType == null ? 0 : this.taskType;
} }
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
} }

7
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java
Unescape Escape View File

@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean {
@ApiParam("任务周期描述") @ApiParam("任务周期描述")
private String taskCycleDescription; private String taskCycleDescription;
@Column(name="TASK_STATUS")
@ApiParam("任务状态")
private Integer taskStatus;
@Column(name="TASK_PARAM") @Column(name="TASK_PARAM")
@ApiParam("任务参数") @ApiParam("任务参数")
private String taskParam; private String taskParam;
@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean {
return this.taskType == null ? 0 : this.taskType; return this.taskType == null ? 0 : this.taskType;
} }
public int getTaskStatusVal() {
return this.taskStatus == null ? 0 : this.taskStatus;
}
} }

3
modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
Unescape Escape View File

@ -1161,9 +1161,6 @@ public class MesHqlPack {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode);
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean);
DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean);
if (null != mesPcnTask.getTaskStatus()) {
DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean);
}
packBean.setOrderByStr(mesPcnTask.orderBy()); packBean.setOrderByStr(mesPcnTask.orderBy());
return packBean; return packBean;
} }

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

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSocketSuitCase;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCase;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description : 适配器model
* @Reference :
* @Author : yunhao
* @CreateDate : 2019-09-04 15:30
* @Modify:
**/
@Data
public class BsSuitCaseModel {
@ApiParam(value = "适配器")
private BsSuitCase bsSuitCase;
@ApiParam(value = "数据源适配套件")
private BsSuitCaseDataSource bsDataSourceSuitCase;
@ApiParam(value = "socket适配套件")
private BsSocketSuitCase bsSocketSuitCase;
@ApiParam(value = "Web Service 适配套件")
private BsSuitCaseWebService webService;
}

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

@ -1,26 +1,26 @@
package cn.estsh.i3plus.pojo.model.softswitch; //package cn.estsh.i3plus.pojo.model.softswitch;
//
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
/** ///**
* @Description : 数据模型转换对象 // * @Description : 数据模型转换对象
* @Reference : // * @Reference :
* @Author : alwaysfrin // * @Author : alwaysfrin
* @CreateDate : 2019-04-29 11:11 // * @CreateDate : 2019-04-29 11:11
* @Modify: // * @Modify:
**/ // **/
public class DataSwitchModel { //public class DataSwitchModel {
//
private String stringVal; // private String stringVal;
//
private Long longVal; // private Long longVal;
//
private Double doubleVal; // private Double doubleVal;
//
private List<?> listVal; // private List<?> listVal;
//
private Map<String,?> mapVal; // private Map<String,?> mapVal;
//
private Object[] arrayVal; // private Object[] arrayVal;
} //}

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

@ -1,50 +1,50 @@
package cn.estsh.i3plus.pojo.model.softswitch; //package cn.estsh.i3plus.pojo.model.softswitch;
//
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; //import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute; //import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import com.thoughtworks.xstream.annotations.XStreamImplicit; //import com.thoughtworks.xstream.annotations.XStreamImplicit;
import lombok.Data; //import lombok.Data;
//
import java.util.List; //import java.util.List;
import java.util.Map; //import java.util.Map;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : wei.peng // * @Author : wei.peng
* @CreateDate : 19-7-25 下午3:31 // * @CreateDate : 19-7-25 下午3:31
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@XStreamAlias("auth") //@XStreamAlias("auth")
public class PojoAuth{ //public class PojoAuth{
//
@XStreamAsAttribute // @XStreamAsAttribute
private Long id; // private Long id;
@XStreamAsAttribute // @XStreamAsAttribute
private Integer authType; // private Integer authType;
//
@XStreamImplicit // @XStreamImplicit
private List<Prop> params; // private List<Prop> params;
//
private String authPath; // private String authPath;
private String userName ="登录名称"; // private String userName ="登录名称";
private String password ="登录名称"; // private String password ="登录名称";
private String languageCode ="登录名称"; // private String languageCode ="登录名称";
//
// 认证令牌 // // 认证令牌
private String token; // private String token;
// // 认证令牌集合(复杂认证令牌) //// // 认证令牌集合(复杂认证令牌)
// private List<Prop> tokenList; //// private List<Prop> tokenList;
// 原始认证数据 // // 原始认证数据
@XStreamCDATA // @XStreamCDATA
private String result; // private String result;
//
public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) { // public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
this.id = id; // this.id = id;
this.authType = authType; // this.authType = authType;
this.authPath = authPath; // this.authPath = authPath;
this.params = params; // this.params = params;
} // }
} //}

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

@ -1,28 +1,28 @@
package cn.estsh.i3plus.pojo.model.softswitch; //package cn.estsh.i3plus.pojo.model.softswitch;
//
import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute; //import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data; //import lombok.Data;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : wei.peng // * @Author : wei.peng
* @CreateDate : 19-7-25 下午5:18 // * @CreateDate : 19-7-25 下午5:18
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@XStreamAlias("prop") //@XStreamAlias("prop")
public class Prop { //public class Prop {
//
@XStreamAsAttribute // @XStreamAsAttribute
private Long id; // private Long id;
private String paramName; // private String paramName;
private String paramValue; // private String paramValue;
//
public Prop(Long id, String paramName, String paramValue) { // public Prop(Long id, String paramName, String paramValue) {
this.id = id; // this.id = id;
this.paramName = paramName; // this.paramName = paramName;
this.paramValue = paramValue; // this.paramValue = paramValue;
} // }
} //}

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

@ -1,33 +1,33 @@
package cn.estsh.i3plus.pojo.model.softswitch; //package cn.estsh.i3plus.pojo.model.softswitch;
//
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; //import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamAlias;
import com.thoughtworks.xstream.annotations.XStreamAsAttribute; //import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
import lombok.Data; //import lombok.Data;
//
/** ///**
* @Description : // * @Description :
* @Reference : // * @Reference :
* @Author : wei.peng // * @Author : wei.peng
* @CreateDate : 19-7-25 下午3:31 // * @CreateDate : 19-7-25 下午3:31
* @Modify: // * @Modify:
**/ // **/
@Data //@Data
@XStreamAlias("request") //@XStreamAlias("request")
public class Request{ //public class Request{
//
@XStreamAsAttribute // @XStreamAsAttribute
private Long id; // private Long id;
@XStreamAsAttribute // @XStreamAsAttribute
private Integer requestType; // private Integer requestType;
private String requestPath; // private String requestPath;
//
@XStreamCDATA // @XStreamCDATA
private String result; // private String result;
//
public Request(Long id, Integer requestType,String requestPath) { // public Request(Long id, Integer requestType,String requestPath) {
this.id = id; // this.id = id;
this.requestType = requestType; // this.requestType = requestType;
this.requestPath = requestPath; // this.requestPath = requestPath;
} // }
} //}

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

@ -86,15 +86,19 @@ public class SuitCoreModel {
private String suitResultMessage; private String suitResultMessage;
/** /**
*
* @param requestSource 请求来源 * @param requestSource 请求来源
* @param sslKey 适配认证对象 * @param sslKey 适配认证对象
* @param bsSuitCase 适配器信息 * @param bsSuitCase 适配器信息
*/ */
public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase) { public SuitCoreModel(Integer requestSource, BsSslKey sslKey, BsSuitCase bsSuitCase){
this(requestSource,sslKey, bsSuitCase,null);
}
public SuitCoreModel(Integer requestSource,BsSslKey sslKey, BsSuitCase bsSuitCase,Object bsSuitCaseDetail) {
this.sslKey = sslKey; this.sslKey = sslKey;
this.bsSuitCase = bsSuitCase; this.bsSuitCase = bsSuitCase;
this.requestSource = requestSource; this.requestSource = requestSource;
this.bsSuitCaseDetail = bsSuitCaseDetail;
// 设置套件类型 // 设置套件类型
this.caseType = bsSuitCase.getCaseTypeId(); this.caseType = bsSuitCase.getCaseTypeId();

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

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.model.softswitch;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-9-5 下午7:30
* @Modify:
**/
@Data
@XStreamAlias("model")
public class SuitServerModel {
// 执行方法命令
private String action;
// 执行类型固定类型(SoftSwitchEnumUtil.CASE_TYPE)
private Integer caseType;
/* 认证使用 以后使用 */
private String token;
// 传输单对象
private Object obj;
// 传输集合
private List list;
// 传输键值对
private Map<String,Object> map;
// 传输 JSON 数据
private String json;
}

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

@ -61,7 +61,7 @@ public class BsDataSource extends BaseBean {
@Column(name = "DATA_SOURCE_STATUS") @Column(name = "DATA_SOURCE_STATUS")
@ApiParam(value = "数据源状态") @ApiParam(value = "数据源状态")
private String dataSourceStatus; private Integer dataSourceStatus;
@Column(name = "DATA_SOURCE_DESCRIPTION") @Column(name = "DATA_SOURCE_DESCRIPTION")
@ApiParam(value = "数据源描述") @ApiParam(value = "数据源描述")

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

@ -49,9 +49,9 @@ public class BsSuitCase extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class) @JsonSerialize(using = ToStringSerializer.class)
private Long suitTypeId; private Long suitTypeId;
@Column(name = "SUIT_TYPE_NAME") @Column(name = "SUIT_TYPE_NAME_RDD")
@ApiParam(value = "适配类型名称") @ApiParam(value = "适配类型名称")
private String suitTypeName; private String suitTypeNameRdd;
@Column(name = "SUIT_CASE_CODE") @Column(name = "SUIT_CASE_CODE")
@ApiParam(value = "适配器代码") @ApiParam(value = "适配器代码")
@ -61,6 +61,10 @@ public class BsSuitCase extends BaseBean {
@ApiParam(value = "适配模式(枚举,主动，被动)") @ApiParam(value = "适配模式(枚举,主动，被动)")
private Integer suitModeId; private Integer suitModeId;
@Column(name = "SUIT_SERVER_ACTION_ID")
@ApiParam(value = "Server 适配命令")
private Integer suitServerActionId;
@Column(name = "SUIT_CASE_HOST") @Column(name = "SUIT_CASE_HOST")
@ApiParam(value = "适配主机") @ApiParam(value = "适配主机")
private String suitCaseHost; private String suitCaseHost;
@ -107,7 +111,15 @@ public class BsSuitCase extends BaseBean {
private Integer suitCaseStatus; private Integer suitCaseStatus;
@Transient @Transient
@ApiParam(value = "适配器套件明细")
private Object bsSuitCaseDetail;
@Transient
@ApiParam(value = "适配器参数") @ApiParam(value = "适配器参数")
List<BsSuitCaseParam> bsSuitCaseParamList; private List<BsSuitCaseParam> bsSuitCaseParamList;
@Transient
@ApiParam(value = "参数转换")
private List<BsParamAdapter> bsParamAdapterList;
} }

13
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCase.java → modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSource.java
Unescape Escape View File

@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column; import javax.persistence.Column;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.List;
/** /**
* @Description : 数据库套件 * @Description : 数据库套件
@ -25,9 +27,9 @@ import javax.persistence.Table;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "BS_DATA_SOURCE_SUIT_CASE") @Table(name = "BS_SUIT_CASE_DATA_SOURCE")
@Api(value = "数据库套件", description = "数据库套件") @Api(value = "数据库套件", description = "数据库套件")
public class BsDataSourceSuitCase extends BaseBean { public class BsSuitCaseDataSource extends BaseBean {
@Column(name = "SUIT_CASE_ID") @Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id") @ApiParam(value = "套件id")
@ -46,5 +48,12 @@ public class BsDataSourceSuitCase extends BaseBean {
@ApiParam(value = "数据源名称") @ApiParam(value = "数据源名称")
private String dataSourceNameRdd; private String dataSourceNameRdd;
@Transient
@ApiParam(value = "数据源")
private BsDataSource bsDataSource;
@Transient
@ApiParam(value = "数据库操作")
private List<BsSuitCaseDataSourceTable> bsDataSourceSuitCaseTableList;
} }

20
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsDataSourceSuitCaseTable.java → modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseDataSourceTable.java
Unescape Escape View File

@ -25,9 +25,9 @@ import javax.persistence.Table;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name = "BS_DATA_SOURCE_SUIT_CASE_TABLE") @Table(name = "BS_SUIT_CASE_DATA_SOURCE_TABLE")
@Api(value = "数据库表操作", description = "数据库表操作") @Api(value = "数据库表操作", description = "数据库表操作")
public class BsDataSourceSuitCaseTable extends BaseBean { public class BsSuitCaseDataSourceTable extends BaseBean {
@Column(name = "SUIT_CASE_ID") @Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id") @ApiParam(value = "套件id")
@ -42,6 +42,13 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
@ApiParam(value = "操作类型") @ApiParam(value = "操作类型")
private Integer operateTypeId; private Integer operateTypeId;
public int getOperateTypeIdVal(){
if(operateTypeId == null){
return -1;
}
return operateTypeId.intValue();
}
@Column(name = "EXECUTE_SQL") @Column(name = "EXECUTE_SQL")
@ApiParam(value = "执行sql") @ApiParam(value = "执行sql")
private String executeSql; private String executeSql;
@ -52,7 +59,14 @@ public class BsDataSourceSuitCaseTable extends BaseBean {
@Column(name = "IS_RETURN") @Column(name = "IS_RETURN")
@ApiParam(value = "是否有返回") @ApiParam(value = "是否有返回")
private String isReturn; private Integer isReturn;
public int getIsReturnVal(){
if(isReturn == null){
return -1;
}
return isReturn.intValue();
}
} }

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

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.softswitch.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
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 : WebService 适配套件
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019/9/9 上午11:09
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "BS_SUIT_CASE_WEB_SERVICE")
@Api(value = "WebService", description = "WebService 适配套件")
public class BsSuitCaseWebService extends BaseBean {
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "套件id")
@JsonSerialize(using = ToStringSerializer.class)
private Long suitCaseId;
@Column(name = "SERVICE_TAG_NAME")
@ApiParam(value = "Service Tag Name(包名称)")
private String serviceTagName;
@Column(name = "SERVICE_FUNCTION_NAME")
@ApiParam(value = "Service Function Name(方法名称)")
private String serviceFunctionName;
}

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.softswitch.repository; package cn.estsh.i3plus.pojo.softswitch.repository;
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.BsDataSourceSuitCase; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSource;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
* @Modify: * @Modify:
*/ */
@Repository @Repository
public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsDataSourceSuitCase,Long> { public interface BsDataSourceSuitCaseRepository extends BaseRepository<BsSuitCaseDataSource,Long> {
} }

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

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.softswitch.repository; package cn.estsh.i3plus.pojo.softswitch.repository;
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.BsDataSourceSuitCaseTable; import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseDataSourceTable;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
/** /**
@ -12,7 +12,7 @@ import org.springframework.stereotype.Repository;
* @Modify: * @Modify:
*/ */
@Repository @Repository
public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsDataSourceSuitCaseTable,Long> { public interface BsDataSourceSuitCaseTableRepository extends BaseRepository<BsSuitCaseDataSourceTable,Long> {
} }

14
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.softswitch.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseWebService;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 2019/9/9 上午11:41
* @Modify:
**/
public interface BsSuitCaseWebServiceRepository extends BaseRepository<BsSuitCaseWebService,Long> {
}

40
modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java
Unescape Escape View File

@ -47,7 +47,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean);
@ -65,7 +65,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){ public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean);
@ -80,12 +80,12 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean);
ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); ddlPackBean.setOrderByStr(bsSuitCase.orderBy());
@ -99,7 +99,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){ public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean); DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean);
@ -113,7 +113,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean);
@ -131,7 +131,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean);
@ -147,7 +147,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean);
@ -165,7 +165,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean);
@ -180,7 +180,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean);
@ -196,7 +196,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean);
@ -210,7 +210,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@ -226,7 +226,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean);
DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean);
@ -240,7 +240,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@ -258,7 +258,7 @@ public class SoftSwitchHqlPack {
* @return * @return
*/ */
public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){
DdlPackBean ddlPackBean = new DdlPackBean(); DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean);
@ -266,4 +266,14 @@ public class SoftSwitchHqlPack {
return ddlPackBean; return ddlPackBean;
} }
/**
* WebService 唯一校验
* @param webService
* @return
*/
public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){
DdlPackBean result = DdlPackBean.getDdlPackBean();
return result;
}
} }

70
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
Unescape Escape View File

@ -122,4 +122,74 @@ public class WmsASNMaster extends BaseBean {
@Transient @Transient
@ApiParam("手机") @ApiParam("手机")
private String vendorPhone; private String vendorPhone;
@Transient
@ApiParam("物料代码")
private String partNo;
@Transient
@ApiParam("物料名称")
private String partNoNameRdd;
@Transient
@ApiParam("收货数量")
private Double sumRecQty;
@Transient
@ApiParam("需求数量")
private Double sumQty;
@Transient
@ApiParam("计划日期")
private String planDate;
@Transient
@ApiParam("计划日期开始")
private String planDateStart;
@Transient
@ApiParam("计划日期结束")
private String planDateEnd;
@Transient
@ApiParam("计划时间")
private String planTime;
@Transient
@ApiParam("差异数量")
private Double diffQty;
@Transient
@ApiParam("单据类型") // PO/ASN
private String orderType;
@Transient
@ApiParam("收货状态")
private String recStatus;
@Transient
@ApiParam("项目代码")
private String prodCfgTypeCode;
public WmsASNMaster(){}
public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd,
Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
String recStatus){
this.orderNo = orderNo;
this.asnStatus = asnStatus;
this.vendorNo = vendorNo;
this.partNo = partNo;
this.partNoNameRdd = partNoNameRdd;
this.sumQty = sumQty;
this.sumRecQty = sumRecQty;
this.planDate = planDate;
this.planTime = planTime;
this.diffQty = diffQty;
this.orderType = orderType;
this.recStatus = recStatus;
}
} }

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java
Unescape Escape View File

@ -116,7 +116,7 @@ public class WmsCSFactTrans extends BaseBean {
public Double sumPartQty; public Double sumPartQty;
@Transient @Transient
@ApiParam("存储区编号") @ApiParam("存储区编号组")
public String[] zoneNos; public String[] zoneNos;
public WmsCSFactTrans(){} public WmsCSFactTrans(){}

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.wms.bean;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
import lombok.Data; import lombok.Data;
@ -174,6 +173,10 @@ public class WmsMoveDetails extends BaseBean {
@ApiParam("创建时间") @ApiParam("创建时间")
private String createDateTime; private String createDateTime;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
/* @JSONField(name="fPartNo") /* @JSONField(name="fPartNo")
public String getfPartNo() { public String getfPartNo() {
return fPartNo; return fPartNo;

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
Unescape Escape View File

@ -144,6 +144,11 @@ public class WmsMoveMaster extends BaseBean {
@ApiParam(value = "设备编号") @ApiParam(value = "设备编号")
public String fixId; public String fixId;
@Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public WmsMoveMaster(){}; public WmsMoveMaster(){};
public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage,

149
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
Unescape Escape View File

@ -25,7 +25,7 @@ import javax.persistence.*;
@DynamicInsert @DynamicInsert
@DynamicUpdate @DynamicUpdate
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@Table(name="WMS_MOVE_SN", indexes = { @Table(name = "WMS_MOVE_SN", indexes = {
@Index(columnList = "PART_NO"), @Index(columnList = "PART_NO"),
@Index(columnList = "ORDER_NO"), @Index(columnList = "ORDER_NO"),
@Index(columnList = "SN"), @Index(columnList = "SN"),
@ -35,80 +35,80 @@ import javax.persistence.*;
public class WmsMoveSn extends BaseBean { public class WmsMoveSn extends BaseBean {
private static final long serialVersionUID = 1490715681910614399L; private static final long serialVersionUID = 1490715681910614399L;
@Column(name="ORDER_NO") @Column(name = "ORDER_NO")
@ApiParam("单号") @ApiParam("单号")
public String orderNo; public String orderNo;
@Column(name="ITEM") @Column(name = "ITEM")
@ApiParam("行号") @ApiParam("行号")
public Integer item; public Integer item;
@Column(name="PART_NO") @Column(name = "PART_NO")
@ApiParam("物料编码") @ApiParam("物料编码")
public String partNo; public String partNo;
@Column(name="PART_NAME_RDD") @Column(name = "PART_NAME_RDD")
@ApiParam("物料名称") @ApiParam("物料名称")
public String partNameRdd; public String partNameRdd;
@Column(name="UNIT") @Column(name = "UNIT")
@ApiParam(value = "单位") @ApiParam(value = "单位")
public String unit; public String unit;
@Column(name="SN") @Column(name = "SN")
@ApiParam("条码") @ApiParam("条码")
public String sn; public String sn;
@Column(name="CSN") @Column(name = "CSN")
@ApiParam("客户条码") @ApiParam("客户条码")
public String csn; public String csn;
/** /**
* 状态:1=创建,10=待处理,20=已处理 * 状态:1=创建,10=待处理,20=已处理
*/ */
@Column(name="ITEM_STATUS") @Column(name = "ITEM_STATUS")
@ApiParam(value = "状态", example = "1") @ApiParam(value = "状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description")
public Integer itemStatus; public Integer itemStatus;
@Column(name="REMARK") @Column(name = "REMARK")
@ApiParam("备注") @ApiParam("备注")
public String remark; public String remark;
@Column(name="LOT_NO") @Column(name = "LOT_NO")
@ApiParam("批次编号") @ApiParam("批次编号")
public String lotNo; public String lotNo;
@Column(name="PACKAGE_NO") @Column(name = "PACKAGE_NO")
@ApiParam("容器编号") @ApiParam("容器编号")
public String packAgeNo; public String packAgeNo;
@Column(name="SRC_QTY") @Column(name = "SRC_QTY")
@ColumnDefault("0") @ColumnDefault("0")
@ApiParam(value = "源数量", example = "0") @ApiParam(value = "源数量", example = "0")
public Double srcQty; public Double srcQty;
@Column(name="SRC_WH_NO") @Column(name = "SRC_WH_NO")
@ApiParam("源仓库代码") @ApiParam("源仓库代码")
public String srcWhNo; public String srcWhNo;
@Column(name="SRC_ZONE_NO") @Column(name = "SRC_ZONE_NO")
@ApiParam("源存储区代码") @ApiParam("源存储区代码")
public String srcZoneNo; public String srcZoneNo;
@Column(name="SRC_LOCATE_NO") @Column(name = "SRC_LOCATE_NO")
@ApiParam("源库位代码") @ApiParam("源库位代码")
public String srcLocateNo; public String srcLocateNo;
@Column(name="DEST_WH_NO") @Column(name = "DEST_WH_NO")
@ApiParam("目标仓库代码") @ApiParam("目标仓库代码")
public String destWhNo; public String destWhNo;
@Column(name="DEST_ZONE_NO") @Column(name = "DEST_ZONE_NO")
@ApiParam("目标存储区代码") @ApiParam("目标存储区代码")
public String destZoneNo; public String destZoneNo;
@Column(name="DEST_LOCATE_NO") @Column(name = "DEST_LOCATE_NO")
@ApiParam("目标库位代码") @ApiParam("目标库位代码")
public String destLocateNo; public String destLocateNo;
@ -120,51 +120,51 @@ public class WmsMoveSn extends BaseBean {
@Transient @Transient
private Long finishedCounts; private Long finishedCounts;
@Column(name="DEST_QTY") @Column(name = "DEST_QTY")
@ColumnDefault("0") @ColumnDefault("0")
@ApiParam(value = "目标数量", example = "0") @ApiParam(value = "目标数量", example = "0")
public Double destQty; public Double destQty;
@Column(name="QTY") @Column(name = "QTY")
@ColumnDefault("0") @ColumnDefault("0")
@ApiParam(value = "数量", example = "0") @ApiParam(value = "数量", example = "0")
public Double qty; public Double qty;
@Column(name="SRC_QC_STATUS") @Column(name = "SRC_QC_STATUS")
@ApiParam(value = "源质量状态", example = "1") @ApiParam(value = "源质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
public Integer srcQcStatus; public Integer srcQcStatus;
@Column(name="SRC_SN_STATUS") @Column(name = "SRC_SN_STATUS")
@ApiParam(value = "源条码状态", example = "1") @ApiParam(value = "源条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
public Integer srcSnStatus; public Integer srcSnStatus;
@Column(name="DEST_QC_STATUS") @Column(name = "DEST_QC_STATUS")
@ApiParam(value = "目的质量状态", example = "1") @ApiParam(value = "目的质量状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_QC_STATUS.class, refForeignKey = "value", value = "description")
public Integer descQcStatus; public Integer descQcStatus;
@Column(name="DEST_SN_STATUS") @Column(name = "DEST_SN_STATUS")
@ApiParam(value = "目的条码状态", example = "1") @ApiParam(value = "目的条码状态", example = "1")
@AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
public Integer destSnStatus; public Integer destSnStatus;
@Column(name="DATE_CODE") @Column(name = "DATE_CODE")
@ApiParam("生产日期") @ApiParam("生产日期")
public String dateCode; public String dateCode;
@Column(name="FIX_LOT_NO") @Column(name = "FIX_LOT_NO")
@ApiParam("特殊批次") @ApiParam("特殊批次")
public String fixLotNo; public String fixLotNo;
@Column(name="VENDOR_NO") @Column(name = "VENDOR_NO")
@ApiParam("供应商编号") @ApiParam("供应商编号")
private String vendorNo; private String vendorNo;
@Transient @Transient
@ApiParam("业务类型编码") @ApiParam("业务类型编码")
@AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description")
private Integer busiTypeCode; private Integer busiTypeCode;
@Transient @Transient
@ -183,9 +183,15 @@ public class WmsMoveSn extends BaseBean {
@ApiParam("交易类型名称") @ApiParam("交易类型名称")
private String transTypeName; private String transTypeName;
public WmsMoveSn(){} @Version
@Column(name = "LOCK_VERSION")
@ApiParam(value = "乐观锁", example = "1")
public Integer lockVersion;
public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){ public WmsMoveSn() {
}
public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
this.partNo = partNo; this.partNo = partNo;
this.waitingCounts = waitingCounts; this.waitingCounts = waitingCounts;
this.finishedCounts = finishedCounts; this.finishedCounts = finishedCounts;
@ -199,7 +205,7 @@ public class WmsMoveSn extends BaseBean {
return finishedCounts == null ? 0L : this.finishedCounts; return finishedCounts == null ? 0L : this.finishedCounts;
} }
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,Integer busiTypeCode, String transTypeCode, String refSrc) { public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
this.partNo = partNo; this.partNo = partNo;
this.partNameRdd = partNameRdd; this.partNameRdd = partNameRdd;
this.destQty = destQty; this.destQty = destQty;
@ -207,7 +213,8 @@ public class WmsMoveSn extends BaseBean {
this.transTypeCode = transTypeCode; this.transTypeCode = transTypeCode;
this.refSrc = refSrc; this.refSrc = refSrc;
} }
public WmsMoveSn(String partNo, String partNameRdd, Double destQty,String transTypeCode, String refSrc) {
public WmsMoveSn(String partNo, String partNameRdd, Double destQty, String transTypeCode, String refSrc) {
this.partNo = partNo; this.partNo = partNo;
this.partNameRdd = partNameRdd; this.partNameRdd = partNameRdd;
this.destQty = destQty; this.destQty = destQty;
@ -215,38 +222,38 @@ public class WmsMoveSn extends BaseBean {
this.refSrc = refSrc; this.refSrc = refSrc;
} }
public WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd, 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, 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,String refSrc,String destZoneNo,String destWhNo,Integer busiTypeCode,String sn, Integer destSnStatus, String lotNo, String dateCode, String refSrc, String destZoneNo, String destWhNo, Integer busiTypeCode, String sn,
String createUser,String createDatetime,String modifyDatetime,String modifyUser){ String createUser, String createDatetime, String modifyDatetime, String modifyUser) {
this.organizeCode=organizeCode; this.organizeCode = organizeCode;
this.orderNo=orderNo; this.orderNo = orderNo;
this.item=item; this.item = item;
this.partNo=partNo; this.partNo = partNo;
this.partNameRdd=partNameRdd; this.partNameRdd = partNameRdd;
this.transTypeCode=transTypeCode; this.transTypeCode = transTypeCode;
this.transTypeName=transTypeName; this.transTypeName = transTypeName;
this.itemStatus=itemStatus; this.itemStatus = itemStatus;
this.unit=unit; this.unit = unit;
this.srcLocateNo=srcLocateNo; this.srcLocateNo = srcLocateNo;
this.destLocateNo=destLocateNo; this.destLocateNo = destLocateNo;
this.srcQty=srcQty; this.srcQty = srcQty;
this.srcQty=srcQty; this.srcQty = srcQty;
this.destQty=destQty; this.destQty = destQty;
this.srcQcStatus=srcQcStatus; this.srcQcStatus = srcQcStatus;
this.descQcStatus=descQcStatus; this.descQcStatus = descQcStatus;
this.srcSnStatus=srcSnStatus; this.srcSnStatus = srcSnStatus;
this.destSnStatus=destSnStatus; this.destSnStatus = destSnStatus;
this.lotNo=lotNo; this.lotNo = lotNo;
this.dateCode=dateCode; this.dateCode = dateCode;
this.refSrc = refSrc; this.refSrc = refSrc;
this.destZoneNo = destZoneNo; this.destZoneNo = destZoneNo;
this.destWhNo =destWhNo; this.destWhNo = destWhNo;
this.busiTypeCode = busiTypeCode; this.busiTypeCode = busiTypeCode;
this.sn = sn; this.sn = sn;
this.createUser = createUser; this.createUser = createUser;
this.createDatetime = createDatetime; this.createDatetime = createDatetime;
this.modifyDatetime =modifyDatetime; this.modifyDatetime = modifyDatetime;
this.modifyUser =modifyUser; this.modifyUser = modifyUser;
} }
} }

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java
Unescape Escape View File

@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean {
public WmsPOMasterDetails(){} public WmsPOMasterDetails(){}
public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){ public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){
this.orderNo = orderNo; this.orderNo = orderNo;
this.containerNo = containerNo; this.containerNo = containerNo;
this.partNo = partNo; this.partNo = partNo;
this.item = item; this.item = item;
this.organizeCode = organizeCode; this.organizeCode = organizeCode;
this.erpAreaNo = erpAreaNo;
} }
} }

52
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/SwebProcurementPlanOrder.java
Unescape Escape View File

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.wms.bean.iotio;
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 : jessica.chen
* @CreateDate : 2019-09-09 11:14
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SWEB_PROCUREMENT_PLAN_ORDER")
@Api("开口合同主表")
public class SwebProcurementPlanOrder extends BaseBean {
private static final long serialVersionUID = -4332932784803175933L;
@Column(name = "ORDER_NO")
@ApiParam(value = "合同号")
private String orderNo;
@Column(name = "VENDOR_CODE")
@ApiParam(value = "物料名称")
private String vendorCode;
@Column(name = "VENDOR_NAME")
@ApiParam(value = "物料名称")
private String vendorName;
@Column(name = "PART_NO")
@ApiParam(value = "物料名称")
private String partNo;
@Column(name = "PART_NAME")
@ApiParam(value = "物料名称")
private String partName;
}

16
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/SwebProcurementPlanOrderRepository.java
Unescape Escape View File

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.wms.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.wms.bean.iotio.SwebProcurementPlanOrder;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : jessica.chen
* @CreateDate : 2019-09-09 14:49
* @Modify:
**/
@Repository
public interface SwebProcurementPlanOrderRepository extends BaseRepository<SwebProcurementPlanOrder, Long> {
}
Write Preview
Loading…
Cancel
Save