development-history/proxy.git

			@@ -1,6 +1,7 @@
			package cn.com.basic.face.discern.entity;

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

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

			@@ -118,6 +119,22 @@
			* 设备所在机构id
			*/
			public static final String deviceCompanyId = "deviceCompanyId";
			/**
			* 数据是否有效
			*/
			public static final String isValid = "isValid";
			/**
			* 创建时间
			*/
			public static final String createTime = "createTime";
			/**
			* 摄像头品牌
			*/
			public static final String brand = "brand";
			/**
			* 分辨率
			*/
			public static final String resolution = "resolution";
			}

			// 设备主键
			@@ -172,26 +189,14 @@
			private String isSynchron;
			// 设备所在机构id
			private String deviceCompanyId;

			// 数据是否有效
			private String isValid;

			// 创建时间
			private String createTime;

			public String getIsValid() {
			return isValid;
			}

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

			public String getCreateTime() {
			return createTime;
			}

			public void setCreateTime(String createTime) {
			this.createTime = createTime;
			}
			// 摄像头品牌
			private String brand;
			// 分辨率
			private String resolution;

			/**
			* Get 设备主键
			@@ -533,7 +538,7 @@

			/**
			* Get 是否同步
			* ，Y--已同步，N--未同步
			* ，Y-已同步，N-未同步
			*/
			public String getIsSynchron() {
			return isSynchron;
			@@ -541,7 +546,7 @@

			/**
			* Set 是否同步
			* ，Y--已同步，N--未同步
			* ，Y-已同步，N-未同步
			*/
			public void setIsSynchron(String isSynchron) {
			this.isSynchron = isSynchron;
			@@ -561,16 +566,76 @@
			this.deviceCompanyId = deviceCompanyId;
			}

			/**
			* Get 数据是否有效
			* ，作为软删除的判断条件，1-有效，0-无效
			*/
			public String getIsValid() {
			return isValid;
			}

			/**
			* Set 数据是否有效
			* ，作为软删除的判断条件，1-有效，0-无效
			*/
			public void setIsValid(String isValid) {
			this.isValid = isValid;
			}

			/**
			* Get 创建时间
			*/
			public String getCreateTime() {
			return createTime;
			}

			/**
			* Set 创建时间
			*/
			public void setCreateTime(String createTime) {
			this.createTime = createTime;
			}

			/**
			* Get 摄像头品牌
			*/
			public String getBrand() {
			return brand;
			}

			/**
			* Set 摄像头品牌
			*/
			public void setBrand(String brand) {
			this.brand = brand;
			}

			/**
			* Get 分辨率
			*/
			public String getResolution() {
			return resolution;
			}

			/**
			* Set 分辨率
			*/
			public void setResolution(String resolution) {
			this.resolution = resolution;
			}

			public String toString() {
			return
			",设备主键 =" + deviceId + ",设备所属公司 ="+ companyId + ",设备名称 =" + deviceName +
			",设备类型 =" + type + ",设备地址 =" + installAddress + ",学校名称 =" + schoolName +
			",品牌 =" + brandId + ",IP =" + ip + ",端口 =" + port +
			",分辨率 =" + resolutionId + ",用户名 =" + username + ",密码 =" + password +
			",通讯协议 =" + protocolId + ",序列号 =" + sn + ",所属设备id ="+ belongId +
			",负责人 =" + principal + ",安装时间 =" + installTime + ",安装公司 =" + installCompany +
			",生产厂家 =" + manufacturer + ",生产日期 =" + productionDate + ",备注 =" + remark +
			",报废日期 =" + scrappedDate + ",设备id =" + snId + ",同步时间 =" + updateTime +
			",是否同步 =" + isSynchron + ",设备所在机构id ="+ deviceCompanyId;
			return
			",设备主键 =" + deviceId + ",设备所属公司 ="+ companyId + ",设备名称 =" + deviceName +
			",设备类型 =" + type + ",设备地址 =" + installAddress + ",学校名称 =" + schoolName +
			",品牌 =" + brandId + ",IP =" + ip + ",端口 =" + port +
			",分辨率 =" + resolutionId + ",用户名 =" + username + ",密码 =" + password +
			",通讯协议 =" + protocolId + ",序列号 =" + sn + ",所属设备id ="+ belongId +
			",负责人 =" + principal + ",安装时间 =" + installTime + ",安装公司 =" + installCompany +
			",生产厂家 =" + manufacturer + ",生产日期 =" + productionDate + ",备注 =" + remark +
			",报废日期 =" + scrappedDate + ",设备id =" + snId + ",同步时间 =" + updateTime +
			",是否同步 =" + isSynchron + ",设备所在机构id ="+ deviceCompanyId + ",数据是否有效 ="+ isValid +
			",创建时间 =" + createTime + ",摄像头品牌 ="+ brand + ",分辨率 =" + resolution
			;
			}
			}