development-history/proxy.git

			@@ -1,11 +1,12 @@
			package cn.com.basic.face.discern.entity;

			import java.io.Serializable;
			import java.util.Date;

			import cn.com.basic.face.discern.common.BaseEntity;

			/**
			* PhoneCall
			* 不同步
			*/
			public class PhoneCall extends BaseEntity implements Serializable {

			@@ -34,21 +35,18 @@
			* 呼叫发生所在设备(地点)
			*/
			public static final String deviceId = "deviceId";

			/**
			* 同步时间
			*/
			public static final String updateTime="update_time";

			public static final String updateTime = "updateTime";
			/**
			* 是否同步
			*/
			public static final String isSynchron="is_synchron";

			public static final String isSynchron = "isSynchron";
			/**
			* 设备所在机构id
			*/
			private static final String deviceCompanyId="device_company_id";
			public static final String deviceCompanyId = "deviceCompanyId";
			}

			// 签到事件主键
			@@ -61,41 +59,12 @@
			private String calleeId;
			// 呼叫发生所在设备(地点)
			private String deviceId;


			//同步时间
			// 同步时间
			private String updateTime;

			//是否同步
			// 是否同步
			private String isSynchron;


			//设备所在机构id
			// 设备所在机构id
			private String deviceCompanyId;

			public String getDeviceCompanyId() {
			return deviceCompanyId;
			}

			public void setDeviceCompanyId(String deviceCompanyId) {
			this.deviceCompanyId = deviceCompanyId;
			}

			public String getUpdateTime() {
			return updateTime;
			}

			public void setUpdateTime(String updateTime) {
			this.updateTime = updateTime;
			}

			public String getIsSynchron() {
			return isSynchron;
			}

			public void setIsSynchron(String isSynchron) {
			this.isSynchron = isSynchron;
			}

			/**
			* Get 签到事件主键
			@@ -167,9 +136,54 @@
			this.deviceId = deviceId;
			}

			/**
			* Get 同步时间
			*/
			public String getUpdateTime() {
			return updateTime;
			}

			/**
			* Set 同步时间
			*/
			public void setUpdateTime(String updateTime) {
			this.updateTime = updateTime;
			}

			/**
			* Get 是否同步
			* ，Y--已同步，N--未同步
			*/
			public String getIsSynchron() {
			return isSynchron;
			}

			/**
			* Set 是否同步
			* ，Y--已同步，N--未同步
			*/
			public void setIsSynchron(String isSynchron) {
			this.isSynchron = isSynchron;
			}

			/**
			* Get 设备所在机构id
			*/
			public String getDeviceCompanyId() {
			return deviceCompanyId;
			}

			/**
			* Set 设备所在机构id
			*/
			public void setDeviceCompanyId(String deviceCompanyId) {
			this.deviceCompanyId = deviceCompanyId;
			}

			public String toString() {
			return
			",签到事件主键 ="+ phoneCallId + ",呼叫时间 =" + date + ",呼叫人员主键 ="+ callerId +
			",被呼叫人员主键 ="+ calleeId + ",呼叫发生所在设备(地点) ="+ deviceId ;
			return
			",签到事件主键 ="+ phoneCallId + ",呼叫时间 =" + date + ",呼叫人员主键 ="+ callerId +
			",被呼叫人员主键 ="+ calleeId + ",呼叫发生所在设备(地点) ="+ deviceId + ",同步时间 =" + updateTime +
			",是否同步 =" + isSynchron + ",设备所在机构id ="+ deviceCompanyId;
			}
			}