diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index 270703a..fc8ab1c 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -81,7 +81,6 @@ } - @Override public String toString() { return "PGPositionDto{" + diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index 270703a..fc8ab1c 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -81,7 +81,6 @@ } - @Override public String toString() { return "PGPositionDto{" + diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java deleted file mode 100644 index 4e99369..0000000 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.casic.PgInterface.overtimeInPG.dto; - -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; - -public class PGTagPositionDBDto { - public String TagMac; - public String TagName; - public String HostId; - - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; - public String postionUpdateTime; - - -/* -{"Success":true,"ErrorCode":0,"ErrorText":"","TagId":11003,"TagMac":"B0:8E:1A:50:54:88", -"TagName":"马桶监测505488","SerialNo":"","MapId":2,"CoordinatesName":"101洗漱间", -"CoordinatesId":38,"X":-88.7699966430664,"Y":-24.059999465942383,"IsLowBattery":false, -"IsAreaWarning":false,"IsDisappeared":true,"IsBeltBroken":false,"IsReset":false, -"IsStill2Move":false,"IsMove2Still":false,"IsButtonPress":true,"HostName":"马桶监测505488", -"HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", -"postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} - */ -public String getTagMac() { - return TagMac; -} - - public void setTagMac(String tagMac) { - TagMac = tagMac; - } - - public String getTagName() { - return TagName; - } - - public void setTagName(String tagName) { - TagName = tagName; - } - - public String getHostId() { - return HostId; - } - - public void setHostId(String hostId) { - HostId = hostId; - } - - public String getHostName() { - return HostName; - } - - public void setHostName(String hostName) { - HostName = hostName; - } - - public String getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - public String getCoordinatesId() { - return CoordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return CoordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; - } - - public String getX() { - return X; - } - - public void setX(String x) { - X = x; - } - - public String getY() { - return Y; - } - - public void setY(String y) { - Y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } - - public void setPostionUpdateTime(String postionUpdateTime) { - this.postionUpdateTime = postionUpdateTime; - } - - - public PGTagPositionDBDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - this.setX(pgTagPosition.getX()); - this.setY(pgTagPosition.getY()); - } - - @Override - public String toString() { - return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + - ", postionUpdateTime='" + postionUpdateTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index 270703a..fc8ab1c 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -81,7 +81,6 @@ } - @Override public String toString() { return "PGPositionDto{" + diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java deleted file mode 100644 index 4e99369..0000000 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.casic.PgInterface.overtimeInPG.dto; - -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; - -public class PGTagPositionDBDto { - public String TagMac; - public String TagName; - public String HostId; - - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; - public String postionUpdateTime; - - -/* -{"Success":true,"ErrorCode":0,"ErrorText":"","TagId":11003,"TagMac":"B0:8E:1A:50:54:88", -"TagName":"马桶监测505488","SerialNo":"","MapId":2,"CoordinatesName":"101洗漱间", -"CoordinatesId":38,"X":-88.7699966430664,"Y":-24.059999465942383,"IsLowBattery":false, -"IsAreaWarning":false,"IsDisappeared":true,"IsBeltBroken":false,"IsReset":false, -"IsStill2Move":false,"IsMove2Still":false,"IsButtonPress":true,"HostName":"马桶监测505488", -"HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", -"postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} - */ -public String getTagMac() { - return TagMac; -} - - public void setTagMac(String tagMac) { - TagMac = tagMac; - } - - public String getTagName() { - return TagName; - } - - public void setTagName(String tagName) { - TagName = tagName; - } - - public String getHostId() { - return HostId; - } - - public void setHostId(String hostId) { - HostId = hostId; - } - - public String getHostName() { - return HostName; - } - - public void setHostName(String hostName) { - HostName = hostName; - } - - public String getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - public String getCoordinatesId() { - return CoordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return CoordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; - } - - public String getX() { - return X; - } - - public void setX(String x) { - X = x; - } - - public String getY() { - return Y; - } - - public void setY(String y) { - Y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } - - public void setPostionUpdateTime(String postionUpdateTime) { - this.postionUpdateTime = postionUpdateTime; - } - - - public PGTagPositionDBDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - this.setX(pgTagPosition.getX()); - this.setY(pgTagPosition.getY()); - } - - @Override - public String toString() { - return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + - ", postionUpdateTime='" + postionUpdateTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java index d5ef8bf..ee6a724 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -2,19 +2,32 @@ import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { - public String TagMac; - public String TagName; - public String HostId; +// public String TagMac; +// public String TagName; +// public String HostId; +// public String HostName; +// public String TagId; +// public String CoordinatesId; +// public String CoordinatesName; +// public String X; +// public String Y; - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; + public String tagMac; + public String tagName; + public String hostId; + + + + public String hostName; + public String tagId; + public String coordinatesId; + public String coordinatesName; + public String x; + public String y; public String postionUpdateTime; @@ -27,76 +40,97 @@ "HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", "postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} */ -public String getTagMac() { - return TagMac; +// public String getTagMac() { +// return TagMac; +//} +// public void setTagMac(String tagMac) { +// TagMac = tagMac; +// } +// +// public String getTagName() { +// return TagName; +// } +//// @JsonProperty(value ="tagName") +// public void setTagName(String tagName) { +// TagName = tagName; +// } +// +// public String getHostId() { +// return HostId; +// } +// +// public void setHostId(String hostId) { +// HostId = hostId; +// } + public String getTagMac() { + return tagMac; } public void setTagMac(String tagMac) { - TagMac = tagMac; + this.tagMac = tagMac; } public String getTagName() { - return TagName; + return tagName; } public void setTagName(String tagName) { - TagName = tagName; + this.tagName = tagName; } public String getHostId() { - return HostId; + return hostId; } public void setHostId(String hostId) { - HostId = hostId; + this.hostId = hostId; } - public String getHostName() { - return HostName; + return hostName; } public void setHostName(String hostName) { - HostName = hostName; + this.hostName = hostName; } public String getTagId() { - return TagId; + return tagId; } public void setTagId(String tagId) { - TagId = tagId; + this.tagId = tagId; } public String getCoordinatesId() { - return CoordinatesId; + return coordinatesId; } public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; + this.coordinatesId = coordinatesId; } public String getCoordinatesName() { - return CoordinatesName; + return coordinatesName; } public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; + this.coordinatesName = coordinatesName; } public String getX() { - return X; + return x; } public void setX(String x) { - X = x; + this.x = x; } public String getY() { - return Y; + return y; } public void setY(String y) { - Y = y; + this.y = y; } public String getPostionUpdateTime() { @@ -107,29 +141,31 @@ this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); + public PGTagPositionDto(PGTagPosition pgTagPosition) + { this.setX(pgTagPosition.getX()); this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesId(pgTagPosition.getCoordinate()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + this.setPostionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override public String toString() { return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + "TagMac='" + tagMac + '\'' + + ", TagName='" + tagName + '\'' + + ", HostId='" + hostId + '\'' + + ", HostName='" + hostName + '\'' + + ", TagId='" + tagId + '\'' + + ", CoordinatesId='" + coordinatesId + '\'' + + ", CoordinatesName='" + coordinatesName + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + postionUpdateTime + '\'' + '}'; } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index 270703a..fc8ab1c 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -81,7 +81,6 @@ } - @Override public String toString() { return "PGPositionDto{" + diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java deleted file mode 100644 index 4e99369..0000000 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.casic.PgInterface.overtimeInPG.dto; - -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; - -public class PGTagPositionDBDto { - public String TagMac; - public String TagName; - public String HostId; - - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; - public String postionUpdateTime; - - -/* -{"Success":true,"ErrorCode":0,"ErrorText":"","TagId":11003,"TagMac":"B0:8E:1A:50:54:88", -"TagName":"马桶监测505488","SerialNo":"","MapId":2,"CoordinatesName":"101洗漱间", -"CoordinatesId":38,"X":-88.7699966430664,"Y":-24.059999465942383,"IsLowBattery":false, -"IsAreaWarning":false,"IsDisappeared":true,"IsBeltBroken":false,"IsReset":false, -"IsStill2Move":false,"IsMove2Still":false,"IsButtonPress":true,"HostName":"马桶监测505488", -"HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", -"postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} - */ -public String getTagMac() { - return TagMac; -} - - public void setTagMac(String tagMac) { - TagMac = tagMac; - } - - public String getTagName() { - return TagName; - } - - public void setTagName(String tagName) { - TagName = tagName; - } - - public String getHostId() { - return HostId; - } - - public void setHostId(String hostId) { - HostId = hostId; - } - - public String getHostName() { - return HostName; - } - - public void setHostName(String hostName) { - HostName = hostName; - } - - public String getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - public String getCoordinatesId() { - return CoordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return CoordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; - } - - public String getX() { - return X; - } - - public void setX(String x) { - X = x; - } - - public String getY() { - return Y; - } - - public void setY(String y) { - Y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } - - public void setPostionUpdateTime(String postionUpdateTime) { - this.postionUpdateTime = postionUpdateTime; - } - - - public PGTagPositionDBDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - this.setX(pgTagPosition.getX()); - this.setY(pgTagPosition.getY()); - } - - @Override - public String toString() { - return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + - ", postionUpdateTime='" + postionUpdateTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java index d5ef8bf..ee6a724 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -2,19 +2,32 @@ import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { - public String TagMac; - public String TagName; - public String HostId; +// public String TagMac; +// public String TagName; +// public String HostId; +// public String HostName; +// public String TagId; +// public String CoordinatesId; +// public String CoordinatesName; +// public String X; +// public String Y; - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; + public String tagMac; + public String tagName; + public String hostId; + + + + public String hostName; + public String tagId; + public String coordinatesId; + public String coordinatesName; + public String x; + public String y; public String postionUpdateTime; @@ -27,76 +40,97 @@ "HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", "postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} */ -public String getTagMac() { - return TagMac; +// public String getTagMac() { +// return TagMac; +//} +// public void setTagMac(String tagMac) { +// TagMac = tagMac; +// } +// +// public String getTagName() { +// return TagName; +// } +//// @JsonProperty(value ="tagName") +// public void setTagName(String tagName) { +// TagName = tagName; +// } +// +// public String getHostId() { +// return HostId; +// } +// +// public void setHostId(String hostId) { +// HostId = hostId; +// } + public String getTagMac() { + return tagMac; } public void setTagMac(String tagMac) { - TagMac = tagMac; + this.tagMac = tagMac; } public String getTagName() { - return TagName; + return tagName; } public void setTagName(String tagName) { - TagName = tagName; + this.tagName = tagName; } public String getHostId() { - return HostId; + return hostId; } public void setHostId(String hostId) { - HostId = hostId; + this.hostId = hostId; } - public String getHostName() { - return HostName; + return hostName; } public void setHostName(String hostName) { - HostName = hostName; + this.hostName = hostName; } public String getTagId() { - return TagId; + return tagId; } public void setTagId(String tagId) { - TagId = tagId; + this.tagId = tagId; } public String getCoordinatesId() { - return CoordinatesId; + return coordinatesId; } public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; + this.coordinatesId = coordinatesId; } public String getCoordinatesName() { - return CoordinatesName; + return coordinatesName; } public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; + this.coordinatesName = coordinatesName; } public String getX() { - return X; + return x; } public void setX(String x) { - X = x; + this.x = x; } public String getY() { - return Y; + return y; } public void setY(String y) { - Y = y; + this.y = y; } public String getPostionUpdateTime() { @@ -107,29 +141,31 @@ this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); + public PGTagPositionDto(PGTagPosition pgTagPosition) + { this.setX(pgTagPosition.getX()); this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesId(pgTagPosition.getCoordinate()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + this.setPostionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override public String toString() { return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + "TagMac='" + tagMac + '\'' + + ", TagName='" + tagName + '\'' + + ", HostId='" + hostId + '\'' + + ", HostName='" + hostName + '\'' + + ", TagId='" + tagId + '\'' + + ", CoordinatesId='" + coordinatesId + '\'' + + ", CoordinatesName='" + coordinatesName + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + postionUpdateTime + '\'' + '}'; } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java index a316bd0..d36e76b 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java @@ -24,8 +24,8 @@ } public void getAllMac(){ tagmacRun.getAllMac(); - }; - public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();}; + } + public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();} public static void main(String[] args) { } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java index 7740d20..a5c9721 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagMac.java @@ -1,6 +1,6 @@ package com.casic.PgInterface.overtimeInPG.domain; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +//import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import javax.persistence.*; import java.io.Serializable; diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index 270703a..fc8ab1c 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -81,7 +81,6 @@ } - @Override public String toString() { return "PGPositionDto{" + diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java deleted file mode 100644 index 4e99369..0000000 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.casic.PgInterface.overtimeInPG.dto; - -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; - -public class PGTagPositionDBDto { - public String TagMac; - public String TagName; - public String HostId; - - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; - public String postionUpdateTime; - - -/* -{"Success":true,"ErrorCode":0,"ErrorText":"","TagId":11003,"TagMac":"B0:8E:1A:50:54:88", -"TagName":"马桶监测505488","SerialNo":"","MapId":2,"CoordinatesName":"101洗漱间", -"CoordinatesId":38,"X":-88.7699966430664,"Y":-24.059999465942383,"IsLowBattery":false, -"IsAreaWarning":false,"IsDisappeared":true,"IsBeltBroken":false,"IsReset":false, -"IsStill2Move":false,"IsMove2Still":false,"IsButtonPress":true,"HostName":"马桶监测505488", -"HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", -"postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} - */ -public String getTagMac() { - return TagMac; -} - - public void setTagMac(String tagMac) { - TagMac = tagMac; - } - - public String getTagName() { - return TagName; - } - - public void setTagName(String tagName) { - TagName = tagName; - } - - public String getHostId() { - return HostId; - } - - public void setHostId(String hostId) { - HostId = hostId; - } - - public String getHostName() { - return HostName; - } - - public void setHostName(String hostName) { - HostName = hostName; - } - - public String getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - public String getCoordinatesId() { - return CoordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return CoordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; - } - - public String getX() { - return X; - } - - public void setX(String x) { - X = x; - } - - public String getY() { - return Y; - } - - public void setY(String y) { - Y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } - - public void setPostionUpdateTime(String postionUpdateTime) { - this.postionUpdateTime = postionUpdateTime; - } - - - public PGTagPositionDBDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - this.setX(pgTagPosition.getX()); - this.setY(pgTagPosition.getY()); - } - - @Override - public String toString() { - return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + - ", postionUpdateTime='" + postionUpdateTime + '\'' + - '}'; - } -} diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java index d5ef8bf..ee6a724 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -2,19 +2,32 @@ import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { - public String TagMac; - public String TagName; - public String HostId; +// public String TagMac; +// public String TagName; +// public String HostId; +// public String HostName; +// public String TagId; +// public String CoordinatesId; +// public String CoordinatesName; +// public String X; +// public String Y; - public String HostName; - public String TagId; - public String CoordinatesId; - public String CoordinatesName; - public String X; - public String Y; + public String tagMac; + public String tagName; + public String hostId; + + + + public String hostName; + public String tagId; + public String coordinatesId; + public String coordinatesName; + public String x; + public String y; public String postionUpdateTime; @@ -27,76 +40,97 @@ "HostId":96,"HostGroupIds":[1,9],"HostStatusId":0,"HostExternalId":"5488","HostExternalInfo":"", "postionUpdateTime":"2019-05-22T11:09:31.9387103+08:00"} */ -public String getTagMac() { - return TagMac; +// public String getTagMac() { +// return TagMac; +//} +// public void setTagMac(String tagMac) { +// TagMac = tagMac; +// } +// +// public String getTagName() { +// return TagName; +// } +//// @JsonProperty(value ="tagName") +// public void setTagName(String tagName) { +// TagName = tagName; +// } +// +// public String getHostId() { +// return HostId; +// } +// +// public void setHostId(String hostId) { +// HostId = hostId; +// } + public String getTagMac() { + return tagMac; } public void setTagMac(String tagMac) { - TagMac = tagMac; + this.tagMac = tagMac; } public String getTagName() { - return TagName; + return tagName; } public void setTagName(String tagName) { - TagName = tagName; + this.tagName = tagName; } public String getHostId() { - return HostId; + return hostId; } public void setHostId(String hostId) { - HostId = hostId; + this.hostId = hostId; } - public String getHostName() { - return HostName; + return hostName; } public void setHostName(String hostName) { - HostName = hostName; + this.hostName = hostName; } public String getTagId() { - return TagId; + return tagId; } public void setTagId(String tagId) { - TagId = tagId; + this.tagId = tagId; } public String getCoordinatesId() { - return CoordinatesId; + return coordinatesId; } public void setCoordinatesId(String coordinatesId) { - CoordinatesId = coordinatesId; + this.coordinatesId = coordinatesId; } public String getCoordinatesName() { - return CoordinatesName; + return coordinatesName; } public void setCoordinatesName(String coordinatesName) { - CoordinatesName = coordinatesName; + this.coordinatesName = coordinatesName; } public String getX() { - return X; + return x; } public void setX(String x) { - X = x; + this.x = x; } public String getY() { - return Y; + return y; } public void setY(String y) { - Y = y; + this.y = y; } public String getPostionUpdateTime() { @@ -107,29 +141,31 @@ this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition){ - this.setHostId(pgTagPosition.getHostId()); - this.setCoordinatesName(pgTagPosition.getCoordinatesName()); - this.setHostName(pgTagPosition.getHostName()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); + public PGTagPositionDto(PGTagPosition pgTagPosition) + { this.setX(pgTagPosition.getX()); this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesId(pgTagPosition.getCoordinate()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + this.setPostionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override public String toString() { return "PGTagPositionDto{" + - "TagMac='" + TagMac + '\'' + - ", TagName='" + TagName + '\'' + - ", HostId='" + HostId + '\'' + - ", HostName='" + HostName + '\'' + - ", TagId='" + TagId + '\'' + - ", CoordinatesId='" + CoordinatesId + '\'' + - ", CoordinatesName='" + CoordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + "TagMac='" + tagMac + '\'' + + ", TagName='" + tagName + '\'' + + ", HostId='" + hostId + '\'' + + ", HostName='" + hostName + '\'' + + ", TagId='" + tagId + '\'' + + ", CoordinatesId='" + coordinatesId + '\'' + + ", CoordinatesName='" + coordinatesName + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + postionUpdateTime + '\'' + '}'; } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java index a316bd0..d36e76b 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java @@ -24,8 +24,8 @@ } public void getAllMac(){ tagmacRun.getAllMac(); - }; - public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();}; + } + public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();} public static void main(String[] args) { } } diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index e9d9c4e..6c1254b 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -2,7 +2,8 @@ import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; -import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDBDto; +import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; +import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager; import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager; @@ -61,8 +62,9 @@ long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); resultMap.put("msg","success"); - resultMap.put("result",pgTagPosition); -// resultMap.put("result",new PGTagPositionDBDto(pgTagPosition)); +// resultMap.put("result",pgTagPosition); + resultMap.put("result",new PGTagPositionDto(pgTagPosition)); + System.out.println("test"); return resultMap; }