development-history/proxy.git

			@@ -19,28 +19,99 @@
			*/
			public static final String deviceId = "deviceId";
			/**
			* 公司主键
			* 设备所属公司
			*/
			public static final String deviceCompanyId = "deviceCompanyId";
			public static final String companyId = "companyId";
			/**
			* 设备地点
			* 设备名称
			*/
			public static final String deviceName = "deviceName";
			/**
			* 设备授权码
			* 设备类型
			*/
			public static final String authorizationId = "authorizationId";
			public static final String type = "type";
			/**
			* 设备地址
			*/
			public static final String address = "address";
			/**
			* 学校名称
			*/
			public static final String schoolName = "schoolName";
			/**
			* 品牌
			*/
			public static final String brandId = "brandId";
			/**
			* IP
			*/
			public static final String ip = "ip";
			/**
			* 端口
			*/
			public static final String port = "port";
			/**
			* 分辨率
			*/
			public static final String resolutionId = "resolutionId";
			/**
			* 用户名
			*/
			public static final String username = "username";
			/**
			* 密码
			*/
			public static final String password = "password";
			/**
			* 通讯协议
			*/
			public static final String protocolId = "protocolId";
			/**
			* 序列号
			*/
			public static final String sn = "sn";
			/**
			* 所属设备id
			*/
			public static final String belongId = "belongId";

			public static final String installAdress= "installAdress";
			}

			// 设备主键
			private String deviceId;
			// 公司主键
			private String deviceCompanyId;
			// 设备地点
			// 设备所属公司
			private String companyId;
			// 设备名称
			private String deviceName;
			// 设备授权码
			private String authorizationId;
			// 设备类型
			private String type;
			// 设备地址
			private String address;
			// 学校名称
			private String schoolName;
			// 品牌
			private String brandId;
			// IP
			private String ip;
			// 端口
			private String port;
			// 分辨率
			private String resolutionId;
			// 用户名
			private String username;
			// 密码
			private String password;
			// 通讯协议
			private String protocolId;
			// 序列号
			private String sn;
			// 所属设备id
			private String belongId;
			//安装地址
			private String installAdress;

			public String getInstallAdress(){return installAdress;}
			/**
			* Get 设备主键
			*/
			@@ -56,50 +127,211 @@
			}

			/**
			* Get 公司主键
			* Get 设备所属公司
			*/
			public String getDeviceCompanyId() {
			return deviceCompanyId;
			public String getCompanyId() {
			return companyId;
			}

			/**
			* Set 公司主键
			* Set 设备所属公司
			*/
			public void setDeviceCompanyId(String deviceCompanyId) {
			this.deviceCompanyId = deviceCompanyId;
			public void setCompanyId(String companyId) {
			this.companyId = companyId;
			}

			/**
			* Get 设备地点
			* Get 设备名称
			*/
			public String getDeviceName() {
			return deviceName;
			}

			/**
			* Set 设备地点
			* Set 设备名称
			*/
			public void setDeviceName(String deviceName) {
			this.deviceName = deviceName;
			}

			/**
			* Get 设备授权码
			* Get 设备类型
			* ：camera1, camera2, main_device
			*/
			public String getAuthorizationId() {
			return authorizationId;
			public String getType() {
			return type;
			}

			/**
			* Set 设备授权码
			* Set 设备类型
			* ：camera1, camera2, main_device
			*/
			public void setAuthorizationId(String authorizationId) {
			this.authorizationId = authorizationId;
			public void setType(String type) {
			this.type = type;
			}

			/**
			* Get 设备地址
			*/
			public String getAddress() {
			return address;
			}

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

			/**
			* Get 学校名称
			*/
			public String getSchoolName() {
			return schoolName;
			}

			/**
			* Set 学校名称
			*/
			public void setSchoolName(String schoolName) {
			this.schoolName = schoolName;
			}

			/**
			* Get 品牌
			*/
			public String getBrandId() {
			return brandId;
			}

			/**
			* Set 品牌
			*/
			public void setBrandId(String brandId) {
			this.brandId = brandId;
			}

			/**
			* Get IP
			*/
			public String getIp() {
			return ip;
			}

			/**
			* Set IP
			*/
			public void setIp(String ip) {
			this.ip = ip;
			}

			/**
			* Get 端口
			*/
			public String getPort() {
			return port;
			}

			/**
			* Set 端口
			*/
			public void setPort(String port) {
			this.port = port;
			}

			/**
			* Get 分辨率
			*/
			public String getResolutionId() {
			return resolutionId;
			}

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

			/**
			* Get 用户名
			*/
			public String getUsername() {
			return username;
			}

			/**
			* Set 用户名
			*/
			public void setUsername(String username) {
			this.username = username;
			}

			/**
			* Get 密码
			*/
			public String getPassword() {
			return password;
			}

			/**
			* Set 密码
			*/
			public void setPassword(String password) {
			this.password = password;
			}

			/**
			* Get 通讯协议
			*/
			public String getProtocolId() {
			return protocolId;
			}

			/**
			* Set 通讯协议
			*/
			public void setProtocolId(String protocolId) {
			this.protocolId = protocolId;
			}

			/**
			* Get 序列号
			*/
			public String getSn() {
			return sn;
			}

			/**
			* Set 序列号
			*/
			public void setSn(String sn) {
			this.sn = sn;
			}

			/**
			* Get 所属设备id
			*/
			public String getBelongId() {
			return belongId;
			}

			/**
			* Set 所属设备id
			*/
			public void setBelongId(String belongId) {
			this.belongId = belongId;
			}

			public void setInstallAdress(String installAdress){this.installAdress=installAdress;}
			public String toString() {
			return
			",设备主键 =" + deviceId + ",公司主键 =" + deviceCompanyId + ",设备地点 =" + deviceName +
			",设备授权码 ="+ authorizationId;
			",设备主键 =" + deviceId + ",设备所属公司 ="+ companyId + ",设备名称 =" + deviceName +
			",设备类型 =" + type + ",设备地址 =" + address + ",学校名称 =" + schoolName +
			",品牌 =" + brandId + ",IP =" + ip + ",端口 =" + port +
			",分辨率 =" + resolutionId + ",用户名 =" + username + ",密码 =" + password +
			",通讯协议 =" + protocolId + ",序列号 =" + sn + ",所属设备id ="+ belongId
			;
			}
			}