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 e6c7938..66e1dfc 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 @@ -17,12 +17,12 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CASE_TYPE{ - SOCKET(1,"SOCKET"), - RESTFUL(2,"RESTFUL"), - DATASOURCE(3,"数据源"), - WEBSERVICE(4,"WebService"), - MQ(5,"消息队列"), - WebSocket(6,"WebSocket"); + SOCKET(10,"SOCKET"), + RESTFUL(20,"RESTFUL"), + DATASOURCE(30,"数据源"), + WEBSERVICE(40,"WebService"), + MQ(50,"消息队列"), + WebSocket(60,"WebSocket"); private int value; private String description; @@ -57,7 +57,8 @@ public class BlockSoftSwitchEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum REQUEST_SOURCE{ ACTIVE(1,"主动请求"), - SCHEDULE(2,"定时调度"); + SCHEDULE(2,"定时调度"), + RABBITMQ(3,"MQ 调用"); private int value; private String description; @@ -234,7 +235,7 @@ public class BlockSoftSwitchEnumUtil { return tmp; } - public static DATA_SOURCE_TYPE valueOf(int val) { + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE valueOf(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { if (values()[i].value == val) { @@ -267,7 +268,7 @@ public class BlockSoftSwitchEnumUtil { return null; } - public static DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ + public static BlockSoftSwitchEnumUtil.DATA_SOURCE_TYPE getDataSourceURL(String databaseProductName){ if(StringUtils.isNotBlank(databaseProductName)){ if(databaseProductName.indexOf(":mysql:") != -1){ return SOURCE_MARIA_DB; @@ -304,11 +305,11 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum PARAM_VALUE_TYPE{ - NUM(1,"数字"), - STRING(2,"字符串"), - BOOLEAN(3,"布尔"), - MAP(4,"字典"), - LIST(5,"列表"); + NUM(10,"数字"), + STRING(20,"字符串"), + BOOLEAN(30,"布尔"), + MAP(40,"字典"), + LIST(50,"列表"); private int value; private String description; @@ -378,8 +379,8 @@ public class BlockSoftSwitchEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum SUIT_MODE{ - ACTIVE(1,"主动"), - PASSIVE(2,"被动"); + ACTIVE(1,"客户端"), + PASSIVE(2,"服务端"); private int value; private String description; @@ -478,4 +479,41 @@ public class BlockSoftSwitchEnumUtil { } } + /** + * 适配方式 + */ + @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; + } + } + } diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java index 8466ff9..43874a3 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElement.java @@ -79,6 +79,10 @@ public class BfElement extends BaseBean { @ApiParam(value = "是否删除") private Integer isObjectDel; + @Column(name = "IS_OBJECT_EXPORT") + @ApiParam(value = "是否导出") + private Integer isObjectExport; + @Column(name="ELEMENT_SORT_ATTR_ID") @ApiParam(value ="默认排序属性") @JsonSerialize(using = ToStringSerializer.class) diff --git a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java index 511e343..a102246 100644 --- a/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java +++ b/modules/i3plus-pojo-form/src/main/java/cn/estsh/i3plus/pojo/form/bean/BfElementProperty.java @@ -136,7 +136,7 @@ public class BfElementProperty extends BaseBean { @AnnoOutputColumn(hidden = true) private BfDataObjectProperty objectProperty; - public Object getFormValue() { - return propertyFormValue; - } +// public Object getFormValue() { +// return propertyFormValue == null ? propertyDefaultValue : propertyFormValue; +// } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java index 63ea2de..6088218 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnTask.java @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java index 432e829..2da3ec8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnTask.java @@ -77,10 +77,6 @@ public class MesPcnTask extends BaseBean { @ApiParam("任务周期描述") private String taskCycleDescription; - @Column(name="TASK_STATUS") - @ApiParam("任务状态") - private Integer taskStatus; - @Column(name="TASK_PARAM") @ApiParam("任务参数") private String taskParam; @@ -89,7 +85,4 @@ public class MesPcnTask extends BaseBean { return this.taskType == null ? 0 : this.taskType; } - public int getTaskStatusVal() { - return this.taskStatus == null ? 0 : this.taskStatus; - } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 19ce394..9c3a317 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1161,9 +1161,6 @@ public class MesHqlPack { DdlPackBean packBean = getAllBaseDataByNormalPro(mesPcnTask, organizeCode); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskCode(), "taskCode", packBean); DdlPreparedPack.getStringLikerPack(mesPcnTask.getTaskName(), "taskName", packBean); - if (null != mesPcnTask.getTaskStatus()) { - DdlPreparedPack.getNumEqualPack(mesPcnTask.getTaskStatus(), "taskStatus", packBean); - } packBean.setOrderByStr(mesPcnTask.orderBy()); return packBean; } 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 cf7567b..508888d 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 @@ -3,6 +3,7 @@ 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; @@ -17,12 +18,15 @@ import lombok.Data; public class BsSuitCaseModel { @ApiParam(value = "适配器") - BsSuitCase bsSuitCase; + private BsSuitCase bsSuitCase; @ApiParam(value = "数据源适配套件") - BsSuitCaseDataSource bsDataSourceSuitCase; + private BsSuitCaseDataSource bsDataSourceSuitCase; @ApiParam(value = "socket适配套件") - BsSocketSuitCase bsSocketSuitCase; + private BsSocketSuitCase bsSocketSuitCase; + + @ApiParam(value = "Web Service 适配套件") + private BsSuitCaseWebService webService; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java index cf5b891..031e53a 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/DataSwitchModel.java @@ -1,26 +1,26 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import java.util.List; -import java.util.Map; - -/** - * @Description : 数据模型转换对象 - * @Reference : - * @Author : alwaysfrin - * @CreateDate : 2019-04-29 11:11 - * @Modify: - **/ -public class DataSwitchModel { - - private String stringVal; - - private Long longVal; - - private Double doubleVal; - - private List listVal; - - private Map mapVal; - - private Object[] arrayVal; -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : 数据模型转换对象 +// * @Reference : +// * @Author : alwaysfrin +// * @CreateDate : 2019-04-29 11:11 +// * @Modify: +// **/ +//public class DataSwitchModel { +// +// private String stringVal; +// +// private Long longVal; +// +// private Double doubleVal; +// +// private List listVal; +// +// private Map mapVal; +// +// private Object[] arrayVal; +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java index 80e60a2..190882b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/PojoAuth.java @@ -1,50 +1,50 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import com.thoughtworks.xstream.annotations.XStreamImplicit; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("auth") -public class PojoAuth{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer authType; - - @XStreamImplicit - private List params; - - private String authPath; - private String userName ="登录名称"; - private String password ="登录名称"; - private String languageCode ="登录名称"; - - // 认证令牌 - private String token; -// // 认证令牌集合(复杂认证令牌) -// private List tokenList; - // 原始认证数据 - @XStreamCDATA - private String result; - - public PojoAuth(Long id, Integer authType,String authPath, List params) { - this.id = id; - this.authType = authType; - this.authPath = authPath; - this.params = params; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import com.thoughtworks.xstream.annotations.XStreamImplicit; +//import lombok.Data; +// +//import java.util.List; +//import java.util.Map; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("auth") +//public class PojoAuth{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer authType; +// +// @XStreamImplicit +// private List params; +// +// private String authPath; +// private String userName ="登录名称"; +// private String password ="登录名称"; +// private String languageCode ="登录名称"; +// +// // 认证令牌 +// private String token; +//// // 认证令牌集合(复杂认证令牌) +//// private List tokenList; +// // 原始认证数据 +// @XStreamCDATA +// private String result; +// +// public PojoAuth(Long id, Integer authType,String authPath, List params) { +// this.id = id; +// this.authType = authType; +// this.authPath = authPath; +// this.params = params; +// } +//} \ No newline at end of file diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java index 248ccd5..974ca0e 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Prop.java @@ -1,28 +1,28 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午5:18 - * @Modify: - **/ -@Data -@XStreamAlias("prop") -public class Prop { - - @XStreamAsAttribute - private Long id; - private String paramName; - private String paramValue; - - public Prop(Long id, String paramName, String paramValue) { - this.id = id; - this.paramName = paramName; - this.paramValue = paramValue; - } -} +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午5:18 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("prop") +//public class Prop { +// +// @XStreamAsAttribute +// private Long id; +// private String paramName; +// private String paramValue; +// +// public Prop(Long id, String paramName, String paramValue) { +// this.id = id; +// this.paramName = paramName; +// this.paramValue = paramValue; +// } +//} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java index 87ac9f0..bfdc68c 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/Request.java @@ -1,33 +1,33 @@ -package cn.estsh.i3plus.pojo.model.softswitch; - -import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; -import com.thoughtworks.xstream.annotations.XStreamAlias; -import com.thoughtworks.xstream.annotations.XStreamAsAttribute; -import lombok.Data; - -/** - * @Description : - * @Reference : - * @Author : wei.peng - * @CreateDate : 19-7-25 下午3:31 - * @Modify: - **/ -@Data -@XStreamAlias("request") -public class Request{ - - @XStreamAsAttribute - private Long id; - @XStreamAsAttribute - private Integer requestType; - private String requestPath; - - @XStreamCDATA - private String result; - - public Request(Long id, Integer requestType,String requestPath) { - this.id = id; - this.requestType = requestType; - this.requestPath = requestPath; - } -} \ No newline at end of file +//package cn.estsh.i3plus.pojo.model.softswitch; +// +//import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA; +//import com.thoughtworks.xstream.annotations.XStreamAlias; +//import com.thoughtworks.xstream.annotations.XStreamAsAttribute; +//import lombok.Data; +// +///** +// * @Description : +// * @Reference : +// * @Author : wei.peng +// * @CreateDate : 19-7-25 下午3:31 +// * @Modify: +// **/ +//@Data +//@XStreamAlias("request") +//public class Request{ +// +// @XStreamAsAttribute +// private Long id; +// @XStreamAsAttribute +// private Integer requestType; +// private String requestPath; +// +// @XStreamCDATA +// private String result; +// +// public Request(Long id, Integer requestType,String requestPath) { +// this.id = id; +// this.requestType = requestType; +// this.requestPath = requestPath; +// } +//} \ No newline at end of file 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 new file mode 100644 index 0000000..b78b66f --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java @@ -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 map; + // 传输 JSON 数据 + private String json; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java index db8c3a3..fe70272 100644 --- a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java @@ -49,9 +49,9 @@ public class BsSuitCase extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long suitTypeId; - @Column(name = "SUIT_TYPE_NAME") + @Column(name = "SUIT_TYPE_NAME_RDD") @ApiParam(value = "适配类型名称") - private String suitTypeName; + private String suitTypeNameRdd; @Column(name = "SUIT_CASE_CODE") @ApiParam(value = "适配器代码") @@ -61,6 +61,10 @@ public class BsSuitCase extends BaseBean { @ApiParam(value = "适配模式(枚举,主动，被动)") private Integer suitModeId; + @Column(name = "SUIT_SERVER_ACTION_ID") + @ApiParam(value = "Server 适配命令") + private Integer suitServerActionId; + @Column(name = "SUIT_CASE_HOST") @ApiParam(value = "适配主机") private String suitCaseHost; diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java new file mode 100644 index 0000000..c5e2ef6 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCaseWebService.java @@ -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; + +} diff --git a/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java new file mode 100644 index 0000000..dd92a85 --- /dev/null +++ b/modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/repository/BsSuitCaseWebServiceRepository.java @@ -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 { +} 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 0190f85..362bc5b 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 @@ -47,7 +47,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCaseParam.getParamName(),"paramName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getParamTypeId(), "paramTypeId", ddlPackBean); @@ -65,7 +65,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseParamOnly(BsSuitCaseParam bsSuitCaseParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCaseParam.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCaseParam.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -80,12 +80,12 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitCaseParam(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseName(),"suitCaseName",ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitCaseCode(),"suitCaseCode",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitTypeId(), "suitTypeId", ddlPackBean); - DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeName(),"suitTypeName",ddlPackBean); + DdlPreparedPack.getStringLikerPack(bsSuitCase.getSuitTypeNameRdd(),"suitTypeNameRdd",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getCaseTypeId(), "caseTypeId", ddlPackBean); ddlPackBean.setOrderByStr(bsSuitCase.orderBy()); @@ -99,7 +99,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitCaseOnly(BsSuitCase bsSuitCase){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumNOEqualPack(bsSuitCase.getId(),"id",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitCase.getSuitCaseCode(), "suitCaseCode", ddlPackBean); @@ -113,7 +113,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsParamAdapter(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(),"suitCaseId",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsParamAdapter.getSuitCaseCode(),"suitCaseCode",ddlPackBean); @@ -131,7 +131,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsParamAdapterOnly(BsParamAdapter bsParamAdapter){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getId(), "id", ddlPackBean); DdlPreparedPack.getNumEqualPack(bsParamAdapter.getSuitCaseId(), "suitCaseId", ddlPackBean); @@ -147,7 +147,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSuitSchedule(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getSuitCaseId(),"suitCaseId",ddlPackBean); @@ -165,7 +165,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSuitScheduleOnly(BsSuitSchedule bsSuitSchedule){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSuitSchedule.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSuitSchedule.getScheduleName(),"scheduleName",ddlPackBean); @@ -180,7 +180,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKey(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(),"keyName",ddlPackBean); DdlPreparedPack.getNumEqualPack(bsSslKey.getKeyTypeId(),"keyTypeId",ddlPackBean); @@ -196,7 +196,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyOnly(BsSslKey bsSslKey){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKey.getId(),"id",ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKey.getKeyName(), "keyName", ddlPackBean); @@ -210,7 +210,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsSslKeyParam(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -226,7 +226,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsSslKeyParamOnly(BsSslKeyParam bsSslKeyParam){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsSslKeyParam.getSslKeyId(), "sslKeyId", ddlPackBean); DdlPreparedPack.getStringEqualPack(bsSslKeyParam.getParamName(), "paramName", ddlPackBean); @@ -240,7 +240,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlBsDataSource(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceName(), "dataSourceName", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -258,7 +258,7 @@ public class SoftSwitchHqlPack { * @return */ public static DdlPackBean packHqlCheckBsDataSourceOnly(BsDataSource bsDataSource){ - DdlPackBean ddlPackBean = new DdlPackBean(); + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); DdlPreparedPack.getNumEqualPack(bsDataSource.getId(), "id", ddlPackBean); DdlPreparedPack.getStringLikerPack(bsDataSource.getDataSourceCode(), "dataSourceCode", ddlPackBean); @@ -266,4 +266,14 @@ public class SoftSwitchHqlPack { return ddlPackBean; } + /** + * WebService 唯一校验 + * @param webService + * @return + */ + public static DdlPackBean packHqlCheckWebService(BsSuitCaseWebService webService){ + DdlPackBean result = DdlPackBean.getDdlPackBean(); + + return result; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 897f091..a4e4142 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -122,4 +122,74 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("手机") 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; + } + + }