diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java index 133992251..3cd38474a 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsg.java @@ -1,12 +1,11 @@ package com.simple.domain.po; -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; +import java.util.Date; +import java.util.List; @Table(name = "wx_msg") public class WxMsg implements Serializable { @@ -69,8 +68,24 @@ public class WxMsg implements Serializable { @io.swagger.annotations.ApiModelProperty(value="",name="returnResult") private String returnResult; /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="phones") + @io.swagger.annotations.ApiModelProperty(value="手机号",name="phones") private String phones; + + @io.swagger.annotations.ApiModelProperty(value="签名",name="signature") + private String signature; + + @io.swagger.annotations.ApiModelProperty(value="短信名称",name="name") + private String name; + + @io.swagger.annotations.ApiModelProperty(value="是否立即发送",name="isright") + private Integer isright; + + @io.swagger.annotations.ApiModelProperty(value="标签人群",name="label") + private String label; + + @io.swagger.annotations.ApiModelProperty(value="发送状态",name="sendstatus") + private Integer sendstatus; + public String getTenantId() { return tenantId; } @@ -132,7 +147,45 @@ public class WxMsg implements Serializable { phones = _phones; } + public String getSignature() { + return signature; + } + + public void setSignature(String signature) { + this.signature = signature; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getIsright() { + return isright; + } + + public void setIsright(Integer isright) { + this.isright = isright; + } + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + + public Integer getSendstatus() { + return sendstatus; + } + + public void setSendstatus(Integer sendstatus) { + this.sendstatus = sendstatus; + } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java b/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java new file mode 100644 index 000000000..f868555ff --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMsgCallback.java @@ -0,0 +1,189 @@ +package com.simple.domain.po; + +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Table(name = "wx_msg_callback") +public class WxMsgCallback implements Serializable { + private static final long serialVersionUID = 1L; + + @Id + protected String id; + + @Transient + protected List ids; + @Transient + protected String sortColumns; + + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } + public String getSortColumns() { + return sortColumns; + } + + public List getIds() { + return ids; + } + public void setIds(List ids) { + this.ids = ids; + } + + + + /*租户id**/ + @io.swagger.annotations.ApiModelProperty(value="租户id",name="tenantId") + private String tenantId; + /*批次号**/ + @io.swagger.annotations.ApiModelProperty(value="批次号",name="batchNo") + private String batchNo; + /*手机号**/ + @io.swagger.annotations.ApiModelProperty(value="手机号",name="phone") + private String phone; + /*发送时间**/ + @io.swagger.annotations.ApiModelProperty(value="发送时间",name="begintime") + private Integer begintime; + /*结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="结束时间",name="endtime") + private Integer endtime; + /*发送状态**/ + @io.swagger.annotations.ApiModelProperty(value="发送状态",name="status") + private Integer status; + /*发送状态信息**/ + @io.swagger.annotations.ApiModelProperty(value="发送状态信息",name="statusMsg") + private String statusMsg; + /*签名**/ + @io.swagger.annotations.ApiModelProperty(value="签名",name="sign") + private String sign; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") + private Date createtime; + public String getTenantId() { + return tenantId; + } + public void setTenantId(String _tenantId) { + tenantId = _tenantId; + } + public String getBatchNo() { + return batchNo; + } + public void setBatchNo(String _batchNo) { + batchNo = _batchNo; + } + public String getPhone() { + return phone; + } + public void setPhone(String _phone) { + phone = _phone; + } + public Integer getBegintime() { + return begintime; + } + public void setBegintime(Integer _begintime) { + begintime = _begintime; + } + public Integer getEndtime() { + return endtime; + } + public void setEndtime(Integer _endtime) { + endtime = _endtime; + } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } + public String getStatusMsg() { + return statusMsg; + } + public void setStatusMsg(String _statusMsg) { + statusMsg = _statusMsg; + } + public String getSign() { + return sign; + } + public void setSign(String _sign) { + sign = _sign; + } + public Date getCreatetime() { + return createtime; + } + public void setCreatetime(Date _createtime) { + createtime = _createtime; + } + + + + public static enum Field + { + Id_ASC("`id` ASC"),Id_DESC("`id` DESC") + ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") + ,BatchNo_ASC("`batchNo` ASC"),BatchNo_DESC("`batchNo` DESC") + ,Phone_ASC("`phone` ASC"),Phone_DESC("`phone` DESC") + ,Begintime_ASC("`begintime` ASC"),Begintime_DESC("`begintime` DESC") + ,Endtime_ASC("`endtime` ASC"),Endtime_DESC("`endtime` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") + ,StatusMsg_ASC("`statusMsg` ASC"),StatusMsg_DESC("`statusMsg` DESC") + ,Sign_ASC("`sign` ASC"),Sign_DESC("`sign` DESC") + ,Createtime_ASC("`createtime` ASC"),Createtime_DESC("`createtime` DESC") + ; + private String value; + Field(String value){ + this.value = value; + } + public String getValue() { + return value; + } + public void setCol(String value) { + this.value = value; + } + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(Field... fields) + { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + } + + public void setSortColumns(String sortColumns) + { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new Field[fList.size()])); + } else { + this.setSortColumns(Field.valueOf(sortColumns)); + } + } +}