task.git - Gitblit

			@@ -2,24 +2,33 @@

			import java.util.Date;

			/**
			* Created by a on 2017/6/20.
			* 用于封装每个设备传感器的历史数据
			*/
			public class History {
			private Integer id;

			private String mac;

			private String sensor;
			private String mac_key;
			private Double mac_value;

			private String macKey;

			private Double macValue;

			private Date time;
			private String units;

			public Integer getId() {
			return id;
			}

			public void setId(Integer id) {
			this.id = id;
			}

			public String getMac() {
			return mac;
			}

			public void setMac(String mac) {
			this.mac = mac;
			this.mac = mac == null ? null : mac.trim();
			}

			public String getSensor() {
			@@ -27,23 +36,23 @@
			}

			public void setSensor(String sensor) {
			this.sensor = sensor;
			this.sensor = sensor == null ? null : sensor.trim();
			}

			public String getMac_key() {
			return mac_key;
			public String getMacKey() {
			return macKey;
			}

			public void setMac_key(String mac_key) {
			this.mac_key = mac_key;
			public void setMacKey(String macKey) {
			this.macKey = macKey == null ? null : macKey.trim();
			}

			public Double getMac_value() {
			return mac_value;
			public Double getMacValue() {
			return macValue;
			}

			public void setMac_value(Double mac_value) {
			this.mac_value = mac_value;
			public void setMacValue(Double macValue) {
			this.macValue = macValue;
			}

			public Date getTime() {
			@@ -53,12 +62,4 @@
			public void setTime(Date time) {
			this.time = time;
			}

			public String getUnits() {
			return units;
			}

			public void setUnits(String units) {
			this.units = units;
			}
			}
			}