Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev
# Conflicts: # modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/BsSuitCaseModel.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitCase.java # modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.javayun-zuoyi
汪云昊
6 years ago
commit
eeff3517c6
@ -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<String,?> 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<String,?> mapVal;
|
||||
//
|
||||
// private Object[] arrayVal;
|
||||
//}
|
||||
|
||||
@ -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<Prop> params;
|
||||
|
||||
private String authPath;
|
||||
private String userName ="登录名称";
|
||||
private String password ="登录名称";
|
||||
private String languageCode ="登录名称";
|
||||
|
||||
// 认证令牌
|
||||
private String token;
|
||||
// // 认证令牌集合(复杂认证令牌)
|
||||
// private List<Prop> tokenList;
|
||||
// 原始认证数据
|
||||
@XStreamCDATA
|
||||
private String result;
|
||||
|
||||
public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
|
||||
this.id = id;
|
||||
this.authType = authType;
|
||||
this.authPath = authPath;
|
||||
this.params = params;
|
||||
}
|
||||
}
|
||||
//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<Prop> params;
|
||||
//
|
||||
// private String authPath;
|
||||
// private String userName ="登录名称";
|
||||
// private String password ="登录名称";
|
||||
// private String languageCode ="登录名称";
|
||||
//
|
||||
// // 认证令牌
|
||||
// private String token;
|
||||
//// // 认证令牌集合(复杂认证令牌)
|
||||
//// private List<Prop> tokenList;
|
||||
// // 原始认证数据
|
||||
// @XStreamCDATA
|
||||
// private String result;
|
||||
//
|
||||
// public PojoAuth(Long id, Integer authType,String authPath, List<Prop> params) {
|
||||
// this.id = id;
|
||||
// this.authType = authType;
|
||||
// this.authPath = authPath;
|
||||
// this.params = params;
|
||||
// }
|
||||
//}
|
||||
@ -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;
|
||||
// }
|
||||
//}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
//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;
|
||||
// }
|
||||
//}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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> {
|
||||
}
|
||||
@ -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;
|
||||
|
||||
}
|
||||
@ -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> {
|
||||
}
|
||||
Loading…
Reference in New Issue