development-history/proxy.git

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

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

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

			/**
			* Register
			* 人员表
			*/
			public class Register extends BaseEntity implements Serializable {

			@@ -83,6 +82,72 @@
			* 危险人员警告消息
			*/
			public static final String warning = "warning";
			/**
			* 证件照
			*/
			public static final String idCardPhoto = "idCardPhoto";
			/**
			* 上传自定义照片
			*/
			public static final String uploadCustomPhoto = "uploadCustomPhoto";
			/**
			* 监控图片
			*/
			public static final String surveillancePhoto = "surveillancePhoto";
			/**
			* 监控图片id
			*/
			public static final String surveillancePhotoId = "surveillancePhotoId";
			/**
			* 访客类型
			*/
			public static final String visitorTypeId = "visitorTypeId";
			/**
			* 身份认证
			*/
			public static final String authentication = "authentication";
			/**
			* idCardHeadPhoto
			*/
			public static final String idCardHeadPhoto = "idCardHeadPhoto";
			/**
			* 考勤人员类型
			*/
			public static final String attenderTypeId = "attenderTypeId";
			/**
			* 卡号
			*/
			public static final String cardNumber = "cardNumber";
			/**
			* 同步时间
			*/
			public static final String updateTime = "updateTime";
			/**
			* 是否同步
			*/
			public static final String isSynchron = "isSynchron";
			/**
			* 设备所在机构id
			*/
			public static final String deviceCompanyId = "deviceCompanyId";
			/**
			* 临时原监控文件路径
			*/
			public static final String rawSurveillancePhotoPath = "rawSurveillancePhotoPath";
			/**
			* 临时原监控文件宽度
			*/
			public static final String rawSurveillancePhotoWidth = "rawSurveillancePhotoWidth";
			/**
			* 临时原监控文件高度
			*/
			public static final String rawSurveillancePhotoHeight = "rawSurveillancePhotoHeight";
			/**
			* 临时原监控文件创建时间
			*/
			public static final String post = "createTime";
			public static final String department = "createTime";
			public static final String company = "company";
			}

			// 人员主键
			@@ -119,6 +184,55 @@
			private String remark;
			// 危险人员警告消息
			private String warning;
			// 证件照
			private String idCardPhoto;
			// 上传自定义照片
			private String uploadCustomPhoto;
			// 监控图片
			private String surveillancePhoto;
			// 监控图片id
			private String surveillancePhotoId;
			// 访客类型
			private String visitorTypeId;
			// 身份认证
			private String authentication;
			// idCardHeadPhoto
			private String idCardHeadPhoto;
			// 考勤人员类型
			private String attenderTypeId;
			// 卡号
			private String cardNumber;
			// 同步时间
			private String updateTime;
			// 是否同步
			private String isSynchron;
			// 设备所在机构id
			private String deviceCompanyId;
			// 临时原监控文件路径
			private String rawSurveillancePhotoPath;
			// 临时原监控文件宽度
			private String rawSurveillancePhotoWidth;
			// 临时原监控文件高度
			private String rawSurveillancePhotoHeight;
			// 临时原监控文件创建时间
			private String createTime;
			private String company;
			private String visitorOrAttender;


			private String isValid;


			public String getIsValid() {
			return isValid;
			}

			public void setIsValid(String isValid) {
			this.isValid = isValid;
			}




			/**
			* Get 人员主键
			@@ -358,13 +472,263 @@
			this.warning = warning;
			}

			/**
			* Get 证件照
			*/
			public String getIdCardPhoto() {
			return idCardPhoto;
			}

			/**
			* Set 证件照
			*/
			public void setIdCardPhoto(String idCardPhoto) {
			this.idCardPhoto = idCardPhoto;
			}

			/**
			* Get 上传自定义照片
			*/
			public String getUploadCustomPhoto() {
			return uploadCustomPhoto;
			}

			/**
			* Set 上传自定义照片
			*/
			public void setUploadCustomPhoto(String uploadCustomPhoto) {
			this.uploadCustomPhoto = uploadCustomPhoto;
			}

			/**
			* Get 监控图片
			*/
			public String getSurveillancePhoto() {
			return surveillancePhoto;
			}

			/**
			* Set 监控图片
			*/
			public void setSurveillancePhoto(String surveillancePhoto) {
			this.surveillancePhoto = surveillancePhoto;
			}

			/**
			* Get 监控图片id
			*/
			public String getSurveillancePhotoId() {
			return surveillancePhotoId;
			}

			/**
			* Set 监控图片id
			*/
			public void setSurveillancePhotoId(String surveillancePhotoId) {
			this.surveillancePhotoId = surveillancePhotoId;
			}

			/**
			* Get 访客类型
			*/
			public String getVisitorTypeId() {
			return visitorTypeId;
			}

			/**
			* Set 访客类型
			*/
			public void setVisitorTypeId(String visitorTypeId) {
			this.visitorTypeId = visitorTypeId;
			}

			/**
			* Get 身份认证
			* ：0未认证，1已认证
			*/
			public String getAuthentication() {
			return authentication;
			}

			/**
			* Set 身份认证
			* ：0未认证，1已认证
			*/
			public void setAuthentication(String authentication) {
			this.authentication = authentication;
			}

			/**
			* Get idCardHeadPhoto
			*/
			public String getIdCardHeadPhoto() {
			return idCardHeadPhoto;
			}

			/**
			* Set idCardHeadPhoto
			*/
			public void setIdCardHeadPhoto(String idCardHeadPhoto) {
			this.idCardHeadPhoto = idCardHeadPhoto;
			}

			/**
			* Get 考勤人员类型
			*/
			public String getAttenderTypeId() {
			return attenderTypeId;
			}

			/**
			* Set 考勤人员类型
			*/
			public void setAttenderTypeId(String attenderTypeId) {
			this.attenderTypeId = attenderTypeId;
			}

			/**
			* Get 卡号
			*/
			public String getCardNumber() {
			return cardNumber;
			}

			/**
			* Set 卡号
			*/
			public void setCardNumber(String cardNumber) {
			this.cardNumber = cardNumber;
			}

			/**
			* 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;
			}

			/**
			* Get 临时原监控文件路径
			*/
			public String getRawSurveillancePhotoPath() {
			return rawSurveillancePhotoPath;
			}

			/**
			* Set 临时原监控文件路径
			*/
			public void setRawSurveillancePhotoPath(String rawSurveillancePhotoPath) {
			this.rawSurveillancePhotoPath = rawSurveillancePhotoPath;
			}

			/**
			* Get 临时原监控文件宽度
			*/
			public String getRawSurveillancePhotoWidth() {
			return rawSurveillancePhotoWidth;
			}

			/**
			* Set 临时原监控文件宽度
			*/
			public void setRawSurveillancePhotoWidth(String rawSurveillancePhotoWidth) {
			this.rawSurveillancePhotoWidth = rawSurveillancePhotoWidth;
			}

			/**
			* Get 临时原监控文件高度
			*/
			public String getRawSurveillancePhotoHeight() {
			return rawSurveillancePhotoHeight;
			}

			/**
			* Set 临时原监控文件高度
			*/
			public void setRawSurveillancePhotoHeight(String rawSurveillancePhotoHeight) {
			this.rawSurveillancePhotoHeight = rawSurveillancePhotoHeight;
			}

			/**
			* Get 临时原监控文件创建时间
			*/
			public String getCreateTime() {
			return createTime;
			}

			/**
			* Set 临时原监控文件创建时间
			*/
			public void setCreateTime(String createTime) {
			this.createTime = createTime;
			}

			public String getCompany() {
			return company;
			}

			public void setCompany(String company) {
			this.company = company;
			}

			public String getVisitorOrAttender() {
			return visitorOrAttender;
			}

			public void setVisitorOrAttender(String visitorOrAttender) {
			this.visitorOrAttender = visitorOrAttender;
			}

			public String toString() {
			return
			",人员主键 =" + registerId + ",人员名字 =" + username + ",人员名首字母 ="+ nameEn +
			",性别 =" + genderId + ",国籍 =" + countryId + ",省 =" + province +
			",市 =" + city + ",出生日期 =" + birthday + ",座机电话 =" + tel +
			",移动电话 =" + mobilePhone + ",证件类型 =" + identityTypeId + ",证件编号 =" + identifyNum +
			",公司主键 =" + companyId + ",部门主键 =" + departmentId + ",职务主键 =" + postId +
			",人员备注消息 ="+ remark + ",危险人员警告消息 ="+ warning ;
			return
			",人员主键 =" + registerId + ",人员名字 =" + username + ",人员名首字母 ="+ nameEn +
			",性别 =" + genderId + ",国籍 =" + countryId + ",省 =" + province +
			",市 =" + city + ",出生日期 =" + birthday + ",座机电话 =" + tel +
			",移动电话 =" + mobilePhone + ",证件类型 =" + identityTypeId + ",证件编号 =" + identifyNum +
			",公司主键 =" + companyId + ",部门主键 =" + departmentId + ",职务主键 =" + postId +
			",人员备注消息 ="+ remark + ",危险人员警告消息 ="+ warning + ",证件照 =" + idCardPhoto +
			",上传自定义照片 ="+ uploadCustomPhoto + ",监控图片 =" + surveillancePhoto + ",监控图片id ="+ surveillancePhotoId +
			",访客类型 =" + visitorTypeId + ",身份认证 =" + authentication + ",idCardHeadPhoto ="+ idCardHeadPhoto +
			",考勤人员类型 ="+ attenderTypeId + ",卡号 =" + cardNumber + ",同步时间 =" + updateTime +
			",是否同步 =" + isSynchron + ",设备所在机构id ="+ deviceCompanyId + ",临时原监控文件路径 ="+ rawSurveillancePhotoPath +
			",临时原监控文件宽度 ="+ rawSurveillancePhotoWidth + ",临时原监控文件高度 ="+ rawSurveillancePhotoHeight + ",临时原监控文件创建时间 ="+ createTime
			;
			}
			}