|
@@ -2,13 +2,14 @@ package com.wdkl.ncs.android.middleware.model.dos;
|
|
|
|
|
|
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
|
import com.fasterxml.jackson.databind.PropertyNamingStrategy;
|
|
import com.fasterxml.jackson.databind.annotation.JsonNaming;
|
|
import com.fasterxml.jackson.databind.annotation.JsonNaming;
|
|
-import io.swagger.annotations.ApiModel;
|
|
|
|
-import io.swagger.annotations.ApiModelProperty;
|
|
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Column;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Column;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Id;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Id;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.PrimaryKeyField;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.PrimaryKeyField;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Table;
|
|
import com.wdkl.ncs.android.middleware.model.annotation.Table;
|
|
|
|
|
|
|
|
+import io.swagger.annotations.ApiModel;
|
|
|
|
+import io.swagger.annotations.ApiModelProperty;
|
|
|
|
+
|
|
import java.io.Serializable;
|
|
import java.io.Serializable;
|
|
import java.util.Objects;
|
|
import java.util.Objects;
|
|
|
|
|
|
@@ -65,6 +66,10 @@ public class DeviceDO implements Serializable {
|
|
@Column(name = "device_type")
|
|
@Column(name = "device_type")
|
|
@ApiModelProperty(value = "注册设备类型:1:护士主机 2:医生主机 3:门口机 4:病床分机 5:LCD走廊屏 6:LED点阵屏 7:移动设备 8:护工腕表 9:病人腕表 10:手机App", required = false)
|
|
@ApiModelProperty(value = "注册设备类型:1:护士主机 2:医生主机 3:门口机 4:病床分机 5:LCD走廊屏 6:LED点阵屏 7:移动设备 8:护工腕表 9:病人腕表 10:手机App", required = false)
|
|
private Integer deviceType;
|
|
private Integer deviceType;
|
|
|
|
+
|
|
|
|
+ @Column(name = "sign_type")
|
|
|
|
+ @ApiModelProperty(value = "体征设备类型",required = false)
|
|
|
|
+ private Integer signType;
|
|
/**
|
|
/**
|
|
* 注册设备出厂编号
|
|
* 注册设备出厂编号
|
|
*/
|
|
*/
|
|
@@ -96,6 +101,12 @@ public class DeviceDO implements Serializable {
|
|
@ApiModelProperty(value = "设备别名", required = false)
|
|
@ApiModelProperty(value = "设备别名", required = false)
|
|
private String name;
|
|
private String name;
|
|
/**
|
|
/**
|
|
|
|
+ * 设备号码
|
|
|
|
+ */
|
|
|
|
+ @Column(name = "phone_number" )
|
|
|
|
+ @ApiModelProperty(value="设备号码",required=false)
|
|
|
|
+ private String phoneNumber;
|
|
|
|
+ /**
|
|
* 该设备的有线以太网卡MAC地址
|
|
* 该设备的有线以太网卡MAC地址
|
|
*/
|
|
*/
|
|
@Column(name = "eth_mac")
|
|
@Column(name = "eth_mac")
|
|
@@ -170,7 +181,7 @@ public class DeviceDO implements Serializable {
|
|
/**
|
|
/**
|
|
* null
|
|
* null
|
|
*/
|
|
*/
|
|
- @Column(name = "member_id")
|
|
|
|
|
|
+ @Column(name = "member_id", allowNullUpdate = true)
|
|
@ApiModelProperty(value = "null", required = false)
|
|
@ApiModelProperty(value = "null", required = false)
|
|
private Integer memberId;
|
|
private Integer memberId;
|
|
/**
|
|
/**
|
|
@@ -199,10 +210,23 @@ public class DeviceDO implements Serializable {
|
|
/**
|
|
/**
|
|
* roleId
|
|
* roleId
|
|
*/
|
|
*/
|
|
- @Column(name = "role_id")
|
|
|
|
|
|
+ @Column(name = "role_id", allowNullUpdate = true)
|
|
@ApiModelProperty(value = "roleId", required = false)
|
|
@ApiModelProperty(value = "roleId", required = false)
|
|
private Integer roleId;
|
|
private Integer roleId;
|
|
|
|
|
|
|
|
+ @Column(name = "trans_rs485_id", allowNullUpdate = true)
|
|
|
|
+ @ApiModelProperty(value = "485转换盒ID", required = false)
|
|
|
|
+ private Integer transRs485Id;
|
|
|
|
+
|
|
|
|
+ @Column(name = "trans_audio_id", allowNullUpdate = true)
|
|
|
|
+ @ApiModelProperty(value = "语音转换盒ID", required = false)
|
|
|
|
+ private Integer transAudioId;
|
|
|
|
+
|
|
|
|
+ @Column(name = "group_id", allowNullUpdate = true)
|
|
|
|
+ @ApiModelProperty(value = "体征设备组id", required = false)
|
|
|
|
+ private Integer groupId;
|
|
|
|
+
|
|
|
|
+
|
|
@PrimaryKeyField
|
|
@PrimaryKeyField
|
|
public Integer getId() {
|
|
public Integer getId() {
|
|
return id;
|
|
return id;
|
|
@@ -274,6 +298,13 @@ public class DeviceDO implements Serializable {
|
|
this.deviceType = deviceType;
|
|
this.deviceType = deviceType;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public Integer getSignType() {
|
|
|
|
+ return signType;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setSignType(Integer signType) {
|
|
|
|
+ this.signType = signType;
|
|
|
|
+ }
|
|
|
|
|
|
public String getCode() {
|
|
public String getCode() {
|
|
return code;
|
|
return code;
|
|
@@ -320,6 +351,15 @@ public class DeviceDO implements Serializable {
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
+ public String getPhoneNumber() {
|
|
|
|
+ return phoneNumber;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setPhoneNumber(String phoneNumber) {
|
|
|
|
+ this.phoneNumber = phoneNumber;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+
|
|
public String getEthMac() {
|
|
public String getEthMac() {
|
|
return ethMac;
|
|
return ethMac;
|
|
}
|
|
}
|
|
@@ -473,6 +513,30 @@ public class DeviceDO implements Serializable {
|
|
this.config = config;
|
|
this.config = config;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public Integer getTransRs485Id() {
|
|
|
|
+ return transRs485Id;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setTransRs485Id(Integer transRs485Id) {
|
|
|
|
+ this.transRs485Id = transRs485Id;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Integer getTransAudioId() {
|
|
|
|
+ return transAudioId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setTransAudioId(Integer transAudioId) {
|
|
|
|
+ this.transAudioId = transAudioId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public Integer getGroupId() {
|
|
|
|
+ return groupId;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void setGroupId(Integer groupId) {
|
|
|
|
+ this.groupId = groupId;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public boolean equals(Object o) {
|
|
public boolean equals(Object o) {
|
|
if (this == o) return true;
|
|
if (this == o) return true;
|