new operator entity

This commit is contained in:
Sola
2015-12-07 13:43:16 +08:00
parent bdf3cfe74e
commit b0ba46cc77
16 changed files with 212 additions and 145 deletions

View File

@@ -0,0 +1,39 @@
package love.sola.netsupport.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
/**
* ***********************************************
* Created by Sola on 2015/12/6.
* Don't modify this source without my agreement
* ***********************************************
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Entity
@Table(name = "operators")
public class Operator {
@Id
@Column(name = "id", nullable = false, insertable = false, updatable = false)
private Integer id;
@Column(name = "name", nullable = false, insertable = false, updatable = false)
private String name;
@Column(name = "access", nullable = false, insertable = false, updatable = false)
private Integer access;
@Column(name = "wechat", nullable = false, insertable = false, updatable = false)
private String wechat;
private Integer block;
private Integer week;
private String password;
}

View File

@@ -23,6 +23,7 @@ public class Ticket {
public static final String PROPERTY_USER = "user";
public static final String PROPERTY_STATUS = "status";
public static final String PROPERTY_SUBMIT_TIME = "submitTime";
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -31,13 +32,13 @@ public class Ticket {
@JoinColumn(name = TableTicket.COLUMN_SID)
private User user;
private String description;
@Column(name = TableTicket.COLUMN_SUBMIT_TIME, insertable = false)
@Column(name = TableTicket.COLUMN_SUBMIT_TIME, insertable = false, updatable = false)
private Date submitTime;
private String remark;
private Date updateTime;
@ManyToOne(optional = true)
@JoinColumn(name = TableTicket.COLUMN_OPSID)
private User operator;
private Operator operator;
private Integer status;
}

View File

@@ -3,8 +3,6 @@ package love.sola.netsupport.pojo;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import love.sola.netsupport.enums.Block;
import love.sola.netsupport.enums.BlockConverter;
import love.sola.netsupport.enums.ISP;
import love.sola.netsupport.enums.ISPConverter;
@@ -23,6 +21,10 @@ import javax.persistence.*;
@Table(name = "users")
public class User {
public static final String PROPERTY_NAME = "name";
public static final String PROPERTY_WECHAT = "wechatId";
public static final String PROPERTY_BLOCK = "block";
@Id
@Column(name = "id", updatable = false, nullable = false)
private Long id;
@@ -34,8 +36,7 @@ public class User {
private String netAccount;
@Column(name = "wechat")
private String wechatId;
@Convert(converter = BlockConverter.class)
private Block block;
private Integer block;
private Integer room;
private Long phone;