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;

			/**
			* Device
			* 双向
			*/
			public class Device extends BaseEntity implements Serializable {

			@@ -33,7 +34,7 @@
			/**
			* 设备地址
			*/
			public static final String address = "address";
			public static final String installAddress = "installAddress";
			/**
			* 学校名称
			*/
			@@ -74,61 +75,66 @@
			* 所属设备id
			*/
			public static final String belongId = "belongId";

			/**
			* 负责人
			*/
			public static final String principal="principal";

			public static final String principal = "principal";
			/**
			* 安装时间
			*/
			public static final String installTime="installTime";

			public static final String installTime = "installTime";
			/**
			* 安装公司
			*/
			public static final String installCompany="installCompany";

			public static final String installCompany = "installCompany";
			/**
			* 生产厂家
			*/
			public static final String manufacturer="manufacturer";

			public static final String manufacturer = "manufacturer";
			/**
			* 生产日期
			*/
			public static final String productionDate="productionDate";

			public static final String productionDate = "productionDate";
			/**
			* 备注
			*/
			public static final String remark="remark";

			public static final String remark = "remark";
			/**
			* 报废日期
			*/
			public static final String scrappedDate="scrappedDate";

			public static final String scrappedDate = "scrappedDate";
			/**
			*设备id
			* 设备id
			*/
			public static final String snId="snId";

			public static final String snId = "snId";
			/**
			* 同步时间
			*/
			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";
			/**
			* 数据是否有效
			*/
			public static final String isValid = "isValid";
			/**
			* 创建时间
			*/
			public static final String createTime = "createTime";
			/**
			* 摄像头品牌
			*/
			public static final String brand = "brand";
			/**
			* 分辨率
			*/
			public static final String resolution = "resolution";
			}

			// 设备主键
			@@ -140,7 +146,7 @@
			// 设备类型
			private String type;
			// 设备地址
			private String address;
			private String installAddress;
			// 学校名称
			private String schoolName;
			// 品牌
			@@ -161,148 +167,36 @@
			private String sn;
			// 所属设备id
			private String belongId;

			/**
			* 负责人
			*/
			private String principal;

			/**
			* 安装时间
			*/
			private String installTime;

			/**
			* 安装公司
			*/
			private String installCompany;

			/**
			* 生产厂家
			*/
			private String manufacturer;

			/**
			* 生产日期
			*/
			// 负责人
			private String principal;
			// 安装时间
			private String installTime;
			// 安装公司
			private String installCompany;
			// 生产厂家
			private String manufacturer;
			// 生产日期
			private String productionDate;

			/**
			* 备注
			*/
			// 备注
			private String remark;

			/**
			* 报废日期
			*/
			private String scrappedDate;

			/**
			* 设备id

			*/
			// 报废日期
			private String scrappedDate;
			// 设备id
			private String snId;

			private String installAdress;

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

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

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

			public void setPrincipal(String principal) {
			this.principal = principal;
			}

			public void setInstallTime(String installTime) {
			this.installTime = installTime;
			}

			public void setInstallCompany(String installCompany) {
			this.installCompany = installCompany;
			}

			public void setManufacturer(String manufacturer) {
			this.manufacturer = manufacturer;
			}

			public void setProductionDate(String productionDate) {
			this.productionDate = productionDate;
			}

			public void setRemark(String remark) {
			this.remark = remark;
			}

			public void setScrappedDate(String scrappedDate) {
			this.scrappedDate = scrappedDate;
			}

			public void setSnId(String snId) {
			this.snId = snId;
			}

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


			public String getPrincipal() {
			return principal;
			}

			public String getInstallTime() {
			return installTime;
			}

			public String getInstallCompany() {
			return installCompany;
			}

			public String getManufacturer() {
			return manufacturer;
			}

			public String getProductionDate() {
			return productionDate;
			}

			public String getRemark() {
			return remark;
			}

			public String getScrappedDate() {
			return scrappedDate;
			}

			public String getSnId() {
			return snId;
			}
			// 数据是否有效
			private String isValid;
			// 创建时间
			private String createTime;
			// 摄像头品牌
			private String brand;
			// 分辨率
			private String resolution;

			/**
			* Get 设备主键
			@@ -365,15 +259,15 @@
			/**
			* Get 设备地址
			*/
			public String getAddress() {
			return address;
			public String getInstallAddress() {
			return installAddress;
			}

			/**
			* Set 设备地址
			*/
			public void setAddress(String address) {
			this.address = address;
			public void setInstallAddress(String installAddress) {
			this.installAddress = installAddress;
			}

			/**
			@@ -509,14 +403,6 @@
			return belongId;
			}

			public String getInstallAdress() {
			return installAdress;
			}

			public void setInstallAdress(String installAdress) {
			this.installAdress = installAdress;
			}

			/**
			* Set 所属设备id
			*/
			@@ -524,13 +410,232 @@
			this.belongId = belongId;
			}

			/**
			* Get 负责人
			*/
			public String getPrincipal() {
			return principal;
			}

			/**
			* Set 负责人
			*/
			public void setPrincipal(String principal) {
			this.principal = principal;
			}

			/**
			* Get 安装时间
			*/
			public String getInstallTime() {
			return installTime;
			}

			/**
			* Set 安装时间
			*/
			public void setInstallTime(String installTime) {
			this.installTime = installTime;
			}

			/**
			* Get 安装公司
			*/
			public String getInstallCompany() {
			return installCompany;
			}

			/**
			* Set 安装公司
			*/
			public void setInstallCompany(String installCompany) {
			this.installCompany = installCompany;
			}

			/**
			* Get 生产厂家
			*/
			public String getManufacturer() {
			return manufacturer;
			}

			/**
			* Set 生产厂家
			*/
			public void setManufacturer(String manufacturer) {
			this.manufacturer = manufacturer;
			}

			/**
			* Get 生产日期
			*/
			public String getProductionDate() {
			return productionDate;
			}

			/**
			* Set 生产日期
			*/
			public void setProductionDate(String productionDate) {
			this.productionDate = productionDate;
			}

			/**
			* Get 备注
			*/
			public String getRemark() {
			return remark;
			}

			/**
			* Set 备注
			*/
			public void setRemark(String remark) {
			this.remark = remark;
			}

			/**
			* Get 报废日期
			*/
			public String getScrappedDate() {
			return scrappedDate;
			}

			/**
			* Set 报废日期
			*/
			public void setScrappedDate(String scrappedDate) {
			this.scrappedDate = scrappedDate;
			}

			/**
			* Get 设备id
			*/
			public String getSnId() {
			return snId;
			}

			/**
			* Set 设备id
			*/
			public void setSnId(String snId) {
			this.snId = snId;
			}

			/**
			* 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 数据是否有效
			* ，作为软删除的判断条件，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 + ",设备地址 =" + address + ",学校名称 =" + schoolName +
			",品牌 =" + brandId + ",IP =" + ip + ",端口 =" + port +
			",分辨率 =" + resolutionId + ",用户名 =" + username + ",密码 =" + password +
			",通讯协议 =" + protocolId + ",序列号 =" + sn + ",所属设备id ="+ belongId
			;
			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
			;
			}
			}