Merge branch 'icu_visiting' of http://git.wdklian.com/allen/ncs_android_frame into icu_visiting

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

@@ -18,7 +18,7 @@ public class FramePartVO implements Serializable {
 
     private FrameDO framePart;
     private Integer deviceCount;
-    private List<FrameRoomVO> frameRoomVOs;
+    private List<FrameRoomVO> frameRoomVos;
 
 
     public FrameDO getFramePart() {
@@ -37,11 +37,11 @@ public class FramePartVO implements Serializable {
         this.deviceCount = deviceCount;
     }
 
-    public List<FrameRoomVO> getFrameRoomVOs() {
-        return frameRoomVOs;
+    public List<FrameRoomVO> getFrameRoomVos() {
+        return frameRoomVos;
     }
 
-    public void setFrameRoomVOs(List<FrameRoomVO> frameRoomVOs) {
-        this.frameRoomVOs = frameRoomVOs;
+    public void setFrameRoomVos(List<FrameRoomVO> frameRoomVos) {
+        this.frameRoomVos = frameRoomVos;
     }
 }

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

@@ -1,8 +1,9 @@
 package com.wdkl.ncs.android.middleware.model.vo;
 
-
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import com.wdkl.ncs.android.middleware.model.annotation.Column;
-import com.wdkl.ncs.android.middleware.model.dos.InteractionDO;
+import com.wdkl.ncs.android.middleware.model.annotation.Id;
 
 import java.io.Serializable;
 
@@ -14,8 +15,110 @@ import io.swagger.annotations.ApiModelProperty;
  * @author: Vothin
  * @create: 2021/04/02 15:27
  */
-
-public class InteractionVO extends InteractionDO implements Serializable {
+@JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class)
+public class InteractionVO implements Serializable {
+
+    /**
+     * id
+     */
+    @Column(name = "id")
+    @ApiModelProperty(value = "id", required = false)
+    @Id(name = "id")
+    private Integer id;
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_date")
+    @ApiModelProperty(value = "创建时间", required = false)
+    private Long createDate;
+    /**
+     * 科室Id
+     */
+    @Column(name = "part_id")
+    @ApiModelProperty(value = "科室Id", required = false)
+    private Integer partId;
+    /**
+     * 交互类型(1:语音通话,2:视频通话,3:卫生间紧急呼叫,4:语音留言,5:文本消息,6:按键事件)
+     */
+    @Column(name = "action_type")
+    @ApiModelProperty(value = "交互类型(1:语音通话,2:视频通话,3:卫生间紧急呼叫,4:语音留言,5:文本消息,6:按键事件)", required = false)
+    private String actionType;
+    /**
+     * SUCCESS、FAILED
+     */
+    @Column(name = "action_result")
+    @ApiModelProperty(value = "0失败，1成功", required = false)
+    private Integer actionResult;
+    /**
+     * 交互发起设备Id
+     */
+    @Column(name = "from_device_id")
+    @ApiModelProperty(value = "交互发起设备Id", required = false)
+    private Integer fromDeviceId;
+    /**
+     * 交互对象设备Id
+     */
+    @Column(name = "to_device_id")
+    @ApiModelProperty(value = "交互对象设备Id", required = false)
+    private Integer toDeviceId;
+    /**
+     * 发起设备所在空间结构
+     */
+    @Column(name = "from_device_frame_id")
+    @ApiModelProperty(value = "发起设备所在空间结构", required = false)
+    private Integer fromDeviceFrameId;
+    /**
+     * 交互对象所在空间结果
+     */
+    @Column(name = "to_device_frame_id")
+    @ApiModelProperty(value = "交互对象所在空间结果", required = false)
+    private Integer toDeviceFrameId;
+    /**
+     * 交互发起设备使用者member_id
+     */
+    @Column(name = "from_device_member_id")
+    @ApiModelProperty(value = "交互发起设备使用者member_id", required = false)
+    private Integer fromDeviceMemberId;
+    /**
+     * 交互对象设备使用者member_id
+     */
+    @Column(name = "to_device_member_id")
+    @ApiModelProperty(value = "交互对象设备使用者member_id", required = false)
+    private Integer toDeviceMemberId;
+    /**
+     * 交互开始时间(通话时指通话接通时间,与create_time相同)
+     */
+    @Column(name = "action_start")
+    @ApiModelProperty(value = "交互开始时间(通话时指通话接通时间,与create_time相同)", required = false)
+    private Long actionStart;
+    /**
+     * 应答时间
+     */
+    @Column(name = "action_accept")
+    @ApiModelProperty(value = "应答时间", required = false)
+    private Long actionAccept;
+    /**
+     * 交互结束时间(通话时指通话挂断时间,通话挂断后要更新此字段)。事件响应时间、语音已读时间
+     */
+    @Column(name = "action_end")
+    @ApiModelProperty(value = "交互结束时间(通话时指通话挂断时间,通话挂断后要更新此字段)。事件响应时间、语音已读时间", required = false)
+    private Long actionEnd;
+    /**
+     * 交互处理者的member_id
+     */
+    @Column(name = "action_end_member_id")
+    @ApiModelProperty(value = "交互处理者的member_id", required = false)
+    private Integer actionEndMemberId;
+    /**
+     * 交互数据(类型1,2,3为空)(类型4为音频文件地址)(5为文本内容)(类型6为具体按键类型)
+     */
+    @Column(name = "data")
+    @ApiModelProperty(value = "交互数据(类型1,2,3为空)(类型4为音频文件地址)(5为文本内容)(类型6为具体按键类型)", required = false)
+    private String data;
+
+    @Column(name = "action_direction_type")
+    @ApiModelProperty(value = "交互方向类型(1:分机到主机、腕表、医生机,2:主机、腕表、医生机到分机,3主机、腕表、医生机之间互通,4:分机到分机)",required = false)
+    private Integer actionDirectionType;
 
     /** 用户 **/
     @Column(name = "from_customer_id")
@@ -78,6 +181,10 @@ public class InteractionVO extends InteractionDO implements Serializable {
     @ApiModelProperty(value = "发起端设备的设备类型", required = false)
     private Integer fromDeviceType;
 
+    @Column(name = "from_device_name")
+    @ApiModelProperty(value = "发起端设备的名称", required = false)
+    private String fromDeviceName;
+
 
     @Column(name = "to_eth_mac")
     @ApiModelProperty(value = "目的端设备的有线以太网卡MAC地址", required = false)
@@ -96,6 +203,12 @@ public class InteractionVO extends InteractionDO implements Serializable {
     @ApiModelProperty(value = "目的端设备的设备类型", required = false)
     private Integer toDeviceType;
 
+
+    @Column(name = "to_device_name")
+    @ApiModelProperty(value = "目的端设备的名称", required = false)
+    private String toDeviceName;
+
+
     /** 空间结构 **/
 
     @Column(name = "from_frame_type")
@@ -134,10 +247,148 @@ public class InteractionVO extends InteractionDO implements Serializable {
     @ApiModelProperty(value = "外部来电时，from_member亲属关系", required = false)
     private String relativeName;
 
-    @Column(name = "outerior_action_name")
-    @ApiModelProperty(value = "外部来电时，from_member亲属名字", required = false)
-    private String outeriorActionName;
+    @Column(name = "action_end_member_name")
+    @ApiModelProperty(value = "交互处理者的用户姓名", required = false)
+    private String actionEndMemberName;
+
+
+
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Long getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Long createDate) {
+        this.createDate = createDate;
+    }
+
+    public Integer getPartId() {
+        return partId;
+    }
+
+    public void setPartId(Integer partId) {
+        this.partId = partId;
+    }
+
+    public String getActionType() {
+        return actionType;
+    }
+
+    public void setActionType(String actionType) {
+        this.actionType = actionType;
+    }
+
+    public Integer getActionResult() {
+        return actionResult;
+    }
+
+    public void setActionResult(Integer actionResult) {
+        this.actionResult = actionResult;
+    }
+
+    public Integer getFromDeviceId() {
+        return fromDeviceId;
+    }
+
+    public void setFromDeviceId(Integer fromDeviceId) {
+        this.fromDeviceId = fromDeviceId;
+    }
+
+    public Integer getToDeviceId() {
+        return toDeviceId;
+    }
+
+    public void setToDeviceId(Integer toDeviceId) {
+        this.toDeviceId = toDeviceId;
+    }
+
+    public Integer getFromDeviceFrameId() {
+        return fromDeviceFrameId;
+    }
+
+    public void setFromDeviceFrameId(Integer fromDeviceFrameId) {
+        this.fromDeviceFrameId = fromDeviceFrameId;
+    }
+
+    public Integer getToDeviceFrameId() {
+        return toDeviceFrameId;
+    }
+
+    public void setToDeviceFrameId(Integer toDeviceFrameId) {
+        this.toDeviceFrameId = toDeviceFrameId;
+    }
+
+    public Integer getFromDeviceMemberId() {
+        return fromDeviceMemberId;
+    }
+
+    public void setFromDeviceMemberId(Integer fromDeviceMemberId) {
+        this.fromDeviceMemberId = fromDeviceMemberId;
+    }
+
+    public Integer getToDeviceMemberId() {
+        return toDeviceMemberId;
+    }
+
+    public void setToDeviceMemberId(Integer toDeviceMemberId) {
+        this.toDeviceMemberId = toDeviceMemberId;
+    }
+
+    public Long getActionStart() {
+        return actionStart;
+    }
+
+    public void setActionStart(Long actionStart) {
+        this.actionStart = actionStart;
+    }
+
+    public Long getActionAccept() {
+        return actionAccept;
+    }
+
+    public void setActionAccept(Long actionAccept) {
+        this.actionAccept = actionAccept;
+    }
+
+    public Long getActionEnd() {
+        return actionEnd;
+    }
+
+    public void setActionEnd(Long actionEnd) {
+        this.actionEnd = actionEnd;
+    }
+
+    public Integer getActionEndMemberId() {
+        return actionEndMemberId;
+    }
+
+    public void setActionEndMemberId(Integer actionEndMemberId) {
+        this.actionEndMemberId = actionEndMemberId;
+    }
+
+    public String getData() {
+        return data;
+    }
+
+    public void setData(String data) {
+        this.data = data;
+    }
+
+    public Integer getActionDirectionType() {
+        return actionDirectionType;
+    }
 
+    public void setActionDirectionType(Integer actionDirectionType) {
+        this.actionDirectionType = actionDirectionType;
+    }
 
     public Integer getFromCustomerId() {
         return fromCustomerId;
@@ -243,6 +494,22 @@ public class InteractionVO extends InteractionDO implements Serializable {
         this.fromSipId = fromSipId;
     }
 
+    public Integer getFromDeviceType() {
+        return fromDeviceType;
+    }
+
+    public void setFromDeviceType(Integer fromDeviceType) {
+        this.fromDeviceType = fromDeviceType;
+    }
+
+    public String getFromDeviceName() {
+        return fromDeviceName;
+    }
+
+    public void setFromDeviceName(String fromDeviceName) {
+        this.fromDeviceName = fromDeviceName;
+    }
+
     public String getToEthMac() {
         return toEthMac;
     }
@@ -267,6 +534,22 @@ public class InteractionVO extends InteractionDO implements Serializable {
         this.toSipId = toSipId;
     }
 
+    public Integer getToDeviceType() {
+        return toDeviceType;
+    }
+
+    public void setToDeviceType(Integer toDeviceType) {
+        this.toDeviceType = toDeviceType;
+    }
+
+    public String getToDeviceName() {
+        return toDeviceName;
+    }
+
+    public void setToDeviceName(String toDeviceName) {
+        this.toDeviceName = toDeviceName;
+    }
+
     public Integer getFromFrameType() {
         return fromFrameType;
     }
@@ -331,60 +614,11 @@ public class InteractionVO extends InteractionDO implements Serializable {
         this.relativeName = relativeName;
     }
 
-    public String getOuteriorActionName() {
-        return outeriorActionName;
-    }
-
-    public void setOuteriorActionName(String outeriorActionName) {
-        this.outeriorActionName = outeriorActionName;
-    }
-
-    public Integer getFromDeviceType() {
-        return fromDeviceType;
-    }
-
-    public void setFromDeviceType(Integer fromDeviceType) {
-        this.fromDeviceType = fromDeviceType;
-    }
-
-    public Integer getToDeviceType() {
-        return toDeviceType;
-    }
-
-    public void setToDeviceType(Integer toDeviceType) {
-        this.toDeviceType = toDeviceType;
+    public String getActionEndMemberName() {
+        return actionEndMemberName;
     }
 
-    @Override
-    public String toString() {
-        return "InteractionVO{" +
-                "fromCustomerId=" + fromCustomerId +
-                ", fromMemberName='" + fromMemberName + '\'' +
-                ", fromMemberFace='" + fromMemberFace + '\'' +
-                ", fromClerkId=" + fromClerkId +
-                ", fromRoleName='" + fromRoleName + '\'' +
-                ", toCustomerId=" + toCustomerId +
-                ", toMemberName='" + toMemberName + '\'' +
-                ", toMemberFace='" + toMemberFace + '\'' +
-                ", toClerkId=" + toClerkId +
-                ", toRoleName='" + toRoleName + '\'' +
-                ", fromEthMac='" + fromEthMac + '\'' +
-                ", fromEthIp='" + fromEthIp + '\'' +
-                ", fromSipId='" + fromSipId + '\'' +
-                ", fromDeviceType='" + fromDeviceType + '\'' +
-                ", toEthMac='" + toEthMac + '\'' +
-                ", toEthIp='" + toEthIp + '\'' +
-                ", toSipId='" + toSipId + '\'' +
-                ", toDeviceType='" + toDeviceType + '\'' +
-                ", fromFrameType=" + fromFrameType +
-                ", fromFrameName='" + fromFrameName + '\'' +
-                ", fromFrameFullName='" + fromFrameFullName + '\'' +
-                ", toFrameType=" + toFrameType +
-                ", toFrameName='" + toFrameName + '\'' +
-                ", toFrameFullName='" + toFrameFullName + '\'' +
-                ", relativeId=" + relativeId +
-                ", relativeName='" + relativeName + '\'' +
-                ", outeriorActionName='" + outeriorActionName + '\'' +
-                '}';
+    public void setActionEndMemberName(String actionEndMemberName) {
+        this.actionEndMemberName = actionEndMemberName;
     }
 }