<更新tcp相关数据对象>

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/DeviceDO.java

@@ -8,6 +8,7 @@ import com.wdkl.ncs.android.middleware.model.annotation.PrimaryKeyField;
 import com.wdkl.ncs.android.middleware.model.annotation.Table;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,7 +64,7 @@ public class DeviceDO implements Serializable {
      * 注册设备类型：1：护士主机  2：医生主机  3：门口机  4：病床分机 5：LCD走廊屏  6：LED点阵屏  7：护士腕表  8：护工腕表  9：病人腕表  10：手机App
      */
     @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;
     /**
      * 注册设备出厂编号
@@ -108,6 +109,12 @@ public class DeviceDO implements Serializable {
     @ApiModelProperty(value = "该设备的有线以太网卡分配的IP地址", required = false)
     private String ethIp;
     /**
+     * 该设备的有线以太网卡分配的IP地址端口
+     */
+    @Column(name = "eth_ip_port")
+    @ApiModelProperty(value = "该设备的有线以太网卡分配的IP地址端口", required = false)
+    private String ethIpPort;
+    /**
      * 该设备的WIFI网卡MAC地址
      */
     @Column(name = "wifi_mac")
@@ -136,7 +143,7 @@ public class DeviceDO implements Serializable {
      */
     @Column(name = "status")
     @ApiModelProperty(value = "该设备是否启用状态:false：表示未启用，设备不进入主界面。true：表示已开启正常使用。", required = false)
-    private String status;
+    private Integer status;
     /**
      * SIP服务器IP地址
      */
@@ -160,23 +167,42 @@ public class DeviceDO implements Serializable {
      */
     @Column(name = "sip_status")
     @ApiModelProperty(value = "表示SIP账号状态:true：可以使用   false：暂停使用", required = false)
-    private String sipStatus;
+    private Boolean sipStatus;
     /**
      * null
      */
-    @Column(name = "member_id")
+    @Column(name = "member_id", allowNullUpdate = true)
     @ApiModelProperty(value = "null", required = false)
     private Integer memberId;
     /**
-     *	是否为后备，空或否时为并行
-     */	@Column(name = "bool_backup" )
-    @ApiModelProperty(value="是否为后备，空或否时为并行",required=false)
-    private String boolBackup;
+     * 是否为后备，空或否时为并行
+     */
+    @Column(name = "bool_backup")
+    @ApiModelProperty(value = "是否为后备，空或否时为并行", required = false)
+    private Boolean boolBackup;
     /**
-     *	后备哪个设备，设备id
-     */	@Column(name = "backup_id" )
-    @ApiModelProperty(value="后备哪个设备，设备id",required=false)
+     * 后备哪个设备，设备id
+     */
+    @Column(name = "backup_id")
+    @ApiModelProperty(value = "后备哪个设备，设备id", required = false)
     private Integer backupId;
+    /**
+     * null
+     */
+    @Column(name = "priority")
+    @ApiModelProperty(value = "null", required = false)
+    private Integer priority;
+
+    @Column(name = "config")
+    @ApiModelProperty(value = "设备配置信息，看板设备有配置内容，已json格式存储", required = false)
+    private String config; //
+
+    /**
+     * roleId
+     */
+    @Column(name = "role_id", allowNullUpdate = true)
+    @ApiModelProperty(value = "roleId", required = false)
+    private Integer roleId;
 
 
     @PrimaryKeyField
@@ -215,7 +241,6 @@ public class DeviceDO implements Serializable {
         this.updateTime = updateTime;
     }
 
-
     public Integer getPartId() {
         return partId;
     }
@@ -315,6 +340,14 @@ public class DeviceDO implements Serializable {
     }
 
 
+    public String getEthIpPort() {
+        return ethIpPort;
+    }
+
+    public void setEthIpPort(String ethIpPort) {
+        this.ethIpPort = ethIpPort;
+    }
+
     public String getWifiMac() {
         return wifiMac;
     }
@@ -351,15 +384,14 @@ public class DeviceDO implements Serializable {
     }
 
 
-    public String getStatus() {
+    public Integer getStatus() {
         return status;
     }
 
-    public void setStatus(String status) {
+    public void setStatus(Integer status) {
         this.status = status;
     }
 
-
     public String getSipIp() {
         return sipIp;
     }
@@ -377,7 +409,6 @@ public class DeviceDO implements Serializable {
         this.sipId = sipId;
     }
 
-
     public String getSipPassword() {
         return sipPassword;
     }
@@ -387,15 +418,6 @@ public class DeviceDO implements Serializable {
     }
 
 
-    public String getSipStatus() {
-        return sipStatus;
-    }
-
-    public void setSipStatus(String sipStatus) {
-        this.sipStatus = sipStatus;
-    }
-
-
     public Integer getMemberId() {
         return memberId;
     }
@@ -405,15 +427,22 @@ public class DeviceDO implements Serializable {
     }
 
 
-    public String getBoolBackup() {
+    public Boolean getSipStatus() {
+        return sipStatus;
+    }
+
+    public void setSipStatus(Boolean sipStatus) {
+        this.sipStatus = sipStatus;
+    }
+
+    public Boolean getBoolBackup() {
         return boolBackup;
     }
 
-    public void setBoolBackup(String boolBackup) {
+    public void setBoolBackup(Boolean boolBackup) {
         this.boolBackup = boolBackup;
     }
 
-
     public Integer getBackupId() {
         return backupId;
     }
@@ -421,4 +450,71 @@ public class DeviceDO implements Serializable {
     public void setBackupId(Integer backupId) {
         this.backupId = backupId;
     }
+
+    public Integer getPriority() {
+        return priority;
+    }
+
+    public void setPriority(Integer priority) {
+        this.priority = priority;
+    }
+
+    public Integer getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(Integer roleId) {
+        this.roleId = roleId;
+    }
+
+    public String getConfig() {
+        return config;
+    }
+
+    public void setConfig(String config) {
+        this.config = config;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        DeviceDO deviceDO = (DeviceDO) o;
+        return Objects.equals(id, deviceDO.id) &&
+                Objects.equals(unionId, deviceDO.unionId) &&
+                Objects.equals(createTime, deviceDO.createTime) &&
+                Objects.equals(updateTime, deviceDO.updateTime) &&
+                Objects.equals(partId, deviceDO.partId) &&
+                Objects.equals(syncTime, deviceDO.syncTime) &&
+                Objects.equals(frameId, deviceDO.frameId) &&
+                Objects.equals(deviceType, deviceDO.deviceType) &&
+                Objects.equals(code, deviceDO.code) &&
+                Objects.equals(model, deviceDO.model) &&
+                Objects.equals(softVer, deviceDO.softVer) &&
+                Objects.equals(hardVer, deviceDO.hardVer) &&
+                Objects.equals(name, deviceDO.name) &&
+                Objects.equals(ethMac, deviceDO.ethMac) &&
+                Objects.equals(ethIp, deviceDO.ethIp) &&
+                Objects.equals(ethIpPort, deviceDO.ethIpPort) &&
+                Objects.equals(wifiMac, deviceDO.wifiMac) &&
+                Objects.equals(wifiIp, deviceDO.wifiIp) &&
+                Objects.equals(wifiHostname, deviceDO.wifiHostname) &&
+                Objects.equals(wifiPassword, deviceDO.wifiPassword) &&
+                Objects.equals(status, deviceDO.status) &&
+                Objects.equals(sipIp, deviceDO.sipIp) &&
+                Objects.equals(sipId, deviceDO.sipId) &&
+                Objects.equals(sipPassword, deviceDO.sipPassword) &&
+                Objects.equals(sipStatus, deviceDO.sipStatus) &&
+                Objects.equals(memberId, deviceDO.memberId) &&
+                Objects.equals(boolBackup, deviceDO.boolBackup) &&
+                Objects.equals(backupId, deviceDO.backupId) &&
+                Objects.equals(priority, deviceDO.priority) &&
+                Objects.equals(config, deviceDO.config) &&
+                Objects.equals(roleId, deviceDO.roleId);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, unionId, createTime, updateTime, partId, syncTime, frameId, deviceType, code, model, softVer, hardVer, name, ethMac, ethIp, ethIpPort, wifiMac, wifiIp, wifiHostname, wifiPassword, status, sipIp, sipId, sipPassword, sipStatus, memberId, boolBackup, backupId, priority, config, roleId);
+    }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/PartSettingDO.java

@@ -17,7 +17,6 @@ import io.swagger.annotations.ApiModelProperty;
 @JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
 public class PartSettingDO implements Serializable {
 
-
     /**
      * null
      */
@@ -195,6 +194,20 @@ public class PartSettingDO implements Serializable {
     @ApiModelProperty(value = "呼叫响应超时，单位：秒", required = false)
     private Integer sipOvertime;
 
+    /**
+     * 护士转接时长,单位:秒
+     */
+    @Column(name = "transfer_duration")
+    @ApiModelProperty(value = "护士转接时长,单位:秒", required = false)
+    private Integer transferDuration;
+
+    /**
+     * 护士组长转接时长,单位:秒
+     */
+    @Column(name = "transfer_duration_leader")
+    @ApiModelProperty(value = "护士组长转接时长,单位:秒", required = false)
+    private Integer transferDurationLeader;
+
 
     @PrimaryKeyField
     public Integer getId() {
@@ -434,4 +447,20 @@ public class PartSettingDO implements Serializable {
     public void setSipOvertime(Integer sipOvertime) {
         this.sipOvertime = sipOvertime;
     }
+
+    public Integer getTransferDuration() {
+        return transferDuration;
+    }
+
+    public void setTransferDuration(Integer transferDuration) {
+        this.transferDuration = transferDuration;
+    }
+
+    public Integer getTransferDurationLeader() {
+        return transferDurationLeader;
+    }
+
+    public void setTransferDurationLeader(Integer transferDurationLeader) {
+        this.transferDurationLeader = transferDurationLeader;
+    }
 }

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/DeviceVO.java

@@ -0,0 +1,59 @@
+package com.wdkl.ncs.android.middleware.model.vo;
+
+
+import com.wdkl.ncs.android.middleware.model.annotation.Table;
+import com.wdkl.ncs.android.middleware.model.dos.DeviceDO;
+
+@Table(name = "ncs_device")
+public class DeviceVO extends DeviceDO {
+
+    private String memberName; // 使用人(护士腕表)
+
+    private String roleName; // 使用角色
+
+    private String shopName; // 科室名
+
+    private Integer type; // 设备所在空间结构类型
+
+    private String fullName; // 空间结构全名
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public String getRoleName() {
+        return roleName;
+    }
+
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
+    }
+
+    public String getShopName() {
+        return shopName;
+    }
+
+    public void setShopName(String shopName) {
+        this.shopName = shopName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/NurseDeviceInfoVO.java

@@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty;
  * @description: TODO
  * @date 2021/4/1320:49
  */
-public class NurseDeviceInfoVO extends DeviceDO {
+public class NurseDeviceInfoVO extends DeviceVO {
 
     @Column(name = "hospital_id")
     @ApiModelProperty(value = "医院id", required = false)

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -156,6 +156,8 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             Log.e(TAG, Constants.hospital_name+ Constants.part_name)
         }
 
+        home_radio_bt.isChecked = true
+
         // 添加登录回调
         SocketManager.getInstance().addUserStateCallback(this)
         connectSocket()