diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java new file mode 100644 index 0000000..4e99369 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java @@ -0,0 +1,134 @@ +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/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java new file mode 100644 index 0000000..4e99369 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java @@ -0,0 +1,134 @@ +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 a7eea2c..d5ef8bf 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -8,6 +8,7 @@ public String TagMac; public String TagName; public String HostId; + public String HostName; public String TagId; public String CoordinatesId; @@ -16,6 +17,56 @@ 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; } @@ -56,54 +107,6 @@ this.postionUpdateTime = 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 getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - 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 PGTagPositionDto(PGTagPosition pgTagPosition){ this.setHostId(pgTagPosition.getHostId()); diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java new file mode 100644 index 0000000..4e99369 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java @@ -0,0 +1,134 @@ +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 a7eea2c..d5ef8bf 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -8,6 +8,7 @@ public String TagMac; public String TagName; public String HostId; + public String HostName; public String TagId; public String CoordinatesId; @@ -16,6 +17,56 @@ 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; } @@ -56,54 +107,6 @@ this.postionUpdateTime = 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 getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - 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 PGTagPositionDto(PGTagPosition pgTagPosition){ this.setHostId(pgTagPosition.getHostId()); diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java index 3bd4025..af85d31 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -13,6 +13,7 @@ import javax.persistence.ParameterMode; import javax.persistence.criteria.CriteriaBuilder; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,10 +41,10 @@ return retMap; } - public int getMaxId(String tagMac) + public long getMaxId(String tagMac) { String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; - return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue(); + return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } } diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java new file mode 100644 index 0000000..4e99369 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java @@ -0,0 +1,134 @@ +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 a7eea2c..d5ef8bf 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -8,6 +8,7 @@ public String TagMac; public String TagName; public String HostId; + public String HostName; public String TagId; public String CoordinatesId; @@ -16,6 +17,56 @@ 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; } @@ -56,54 +107,6 @@ this.postionUpdateTime = 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 getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - 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 PGTagPositionDto(PGTagPosition pgTagPosition){ this.setHostId(pgTagPosition.getHostId()); diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java index 3bd4025..af85d31 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -13,6 +13,7 @@ import javax.persistence.ParameterMode; import javax.persistence.criteria.CriteriaBuilder; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,10 +41,10 @@ return retMap; } - public int getMaxId(String tagMac) + public long getMaxId(String tagMac) { String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; - return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue(); + return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java index 44707a1..11d3878 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java @@ -1,71 +1,82 @@ -package com.casic.PgInterface.overtimeInPG.web; - - -import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; -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; -import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.domain.PgInPgStatus; -import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.annotation.Resource; -import java.util.*; - -@Controller -@RequestMapping("rs") -//@RequestMapping("InOutPGrec") -public class PGInOutRecController { -@Resource -private PGInOutRecManager pgInOutRecManager; -@Resource -private PGTagPositionManager pgTagPositionManager; -@Resource -private PgInPgPersonManager pgInPgPersonManager; -@Resource -private PGTagMacManager pgTagMacManager; -@Resource -private PgInPgStatusManager pgInPgStatusManager; - - @RequestMapping("query") - @ResponseBody - public Map query(@RequestParam(value = "dtFrom", required = true) String dtFrom,@RequestParam(value = "dtTo", required = true) String dtTo) - { - Map resultMap = new HashMap<>(); - resultMap = pgInOutRecManager.getInOutRec(dtFrom,dtTo); - return resultMap; - } - - @RequestMapping("getRecentPosition") - @ResponseBody - public Map getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) - { - Map resultMap = new HashMap<>(); - PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); - PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac())); - resultMap.put("msg","success"); - resultMap.put("result",new PGTagPositionDto(pgTagPosition)); - return resultMap; - } - - @RequestMapping("getHistoryByTagmac") - @ResponseBody - public Map getHistoryByTagmac(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) - { - Map resultMap = new HashMap<>(); -// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("PGINPGPERSONID",inPgPersonId); +//package com.casic.PgInterface.overtimeInPG.web; +// +// +//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.PGTagPositionDto; +//import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager; +//import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; +//import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager; +//import com.casic.PgInterface.patroler.domain.PgInPgPerson; +//import com.casic.PgInterface.patroler.domain.PgInPgStatus; +//import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +//import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; +//import org.springframework.stereotype.Controller; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.ResponseBody; +// +//import javax.annotation.Resource; +//import javax.ws.rs.POST; +//import javax.ws.rs.Path; +//import javax.ws.rs.Produces; +//import javax.ws.rs.core.MediaType; +//import java.util.*; +// +//@Controller +//@RequestMapping("rs") +////@RequestMapping("InOutPGrec") +//public class PGInOutRecController { +//@Resource +//private PGInOutRecManager pgInOutRecManager; +//@Resource +//private PGTagPositionManager pgTagPositionManager; +//@Resource +//private PgInPgPersonManager pgInPgPersonManager; +//@Resource +//private PGTagMacManager pgTagMacManager; +//@Resource +//private PgInPgStatusManager pgInPgStatusManager; +// +// @POST +// @Path("query") +// @Produces(MediaType.APPLICATION_JSON) +// public Map query(@RequestParam(value = "dtFrom", required = true) String dtFrom,@RequestParam(value = "dtTo", required = true) String dtTo) +// { +// Map resultMap = new HashMap<>(); +// resultMap = pgInOutRecManager.getInOutRec(dtFrom,dtTo); +// return resultMap; +// } +// +//// @RequestMapping("getRecentPosition") +//// @ResponseBody +// @POST +// @Path("getRecentPosition") +// @Produces(MediaType.APPLICATION_JSON) +// public Map getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) +// { +// Map resultMap = new HashMap<>(); // PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); -// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode()); - - return resultMap; - - } -} +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// 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)); +// return resultMap; +// } +// +// @RequestMapping("getHistoryByTagmac") +// @ResponseBody +// public Map getHistoryByTagmac(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) +// { +// Map resultMap = new HashMap<>(); +//// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("PGINPGPERSONID",inPgPersonId); +//// PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); +//// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode()); +// +// return resultMap; +// +// } +//} diff --git a/.idea/artifacts/PgInterface.xml b/.idea/artifacts/PgInterface.xml deleted file mode 100644 index b8260a5..0000000 --- a/.idea/artifacts/PgInterface.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - $PROJECT_DIR$/../out/artifacts/PgInterface - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java new file mode 100644 index 0000000..4e99369 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDBDto.java @@ -0,0 +1,134 @@ +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 a7eea2c..d5ef8bf 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -8,6 +8,7 @@ public String TagMac; public String TagName; public String HostId; + public String HostName; public String TagId; public String CoordinatesId; @@ -16,6 +17,56 @@ 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; } @@ -56,54 +107,6 @@ this.postionUpdateTime = 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 getTagId() { - return TagId; - } - - public void setTagId(String tagId) { - TagId = tagId; - } - - 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 PGTagPositionDto(PGTagPosition pgTagPosition){ this.setHostId(pgTagPosition.getHostId()); diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java index 3bd4025..af85d31 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -13,6 +13,7 @@ import javax.persistence.ParameterMode; import javax.persistence.criteria.CriteriaBuilder; +import java.math.BigDecimal; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -40,10 +41,10 @@ return retMap; } - public int getMaxId(String tagMac) + public long getMaxId(String tagMac) { String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; - return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue(); + return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java index 44707a1..11d3878 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java @@ -1,71 +1,82 @@ -package com.casic.PgInterface.overtimeInPG.web; - - -import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; -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; -import com.casic.PgInterface.patroler.domain.PgInPgPerson; -import com.casic.PgInterface.patroler.domain.PgInPgStatus; -import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; -import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; - -import javax.annotation.Resource; -import java.util.*; - -@Controller -@RequestMapping("rs") -//@RequestMapping("InOutPGrec") -public class PGInOutRecController { -@Resource -private PGInOutRecManager pgInOutRecManager; -@Resource -private PGTagPositionManager pgTagPositionManager; -@Resource -private PgInPgPersonManager pgInPgPersonManager; -@Resource -private PGTagMacManager pgTagMacManager; -@Resource -private PgInPgStatusManager pgInPgStatusManager; - - @RequestMapping("query") - @ResponseBody - public Map query(@RequestParam(value = "dtFrom", required = true) String dtFrom,@RequestParam(value = "dtTo", required = true) String dtTo) - { - Map resultMap = new HashMap<>(); - resultMap = pgInOutRecManager.getInOutRec(dtFrom,dtTo); - return resultMap; - } - - @RequestMapping("getRecentPosition") - @ResponseBody - public Map getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) - { - Map resultMap = new HashMap<>(); - PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); - PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac())); - resultMap.put("msg","success"); - resultMap.put("result",new PGTagPositionDto(pgTagPosition)); - return resultMap; - } - - @RequestMapping("getHistoryByTagmac") - @ResponseBody - public Map getHistoryByTagmac(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) - { - Map resultMap = new HashMap<>(); -// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("PGINPGPERSONID",inPgPersonId); +//package com.casic.PgInterface.overtimeInPG.web; +// +// +//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.PGTagPositionDto; +//import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager; +//import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; +//import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager; +//import com.casic.PgInterface.patroler.domain.PgInPgPerson; +//import com.casic.PgInterface.patroler.domain.PgInPgStatus; +//import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +//import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; +//import org.springframework.stereotype.Controller; +//import org.springframework.web.bind.annotation.RequestMapping; +//import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.ResponseBody; +// +//import javax.annotation.Resource; +//import javax.ws.rs.POST; +//import javax.ws.rs.Path; +//import javax.ws.rs.Produces; +//import javax.ws.rs.core.MediaType; +//import java.util.*; +// +//@Controller +//@RequestMapping("rs") +////@RequestMapping("InOutPGrec") +//public class PGInOutRecController { +//@Resource +//private PGInOutRecManager pgInOutRecManager; +//@Resource +//private PGTagPositionManager pgTagPositionManager; +//@Resource +//private PgInPgPersonManager pgInPgPersonManager; +//@Resource +//private PGTagMacManager pgTagMacManager; +//@Resource +//private PgInPgStatusManager pgInPgStatusManager; +// +// @POST +// @Path("query") +// @Produces(MediaType.APPLICATION_JSON) +// public Map query(@RequestParam(value = "dtFrom", required = true) String dtFrom,@RequestParam(value = "dtTo", required = true) String dtTo) +// { +// Map resultMap = new HashMap<>(); +// resultMap = pgInOutRecManager.getInOutRec(dtFrom,dtTo); +// return resultMap; +// } +// +//// @RequestMapping("getRecentPosition") +//// @ResponseBody +// @POST +// @Path("getRecentPosition") +// @Produces(MediaType.APPLICATION_JSON) +// public Map getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) +// { +// Map resultMap = new HashMap<>(); // PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); -// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode()); - - return resultMap; - - } -} +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// 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)); +// return resultMap; +// } +// +// @RequestMapping("getHistoryByTagmac") +// @ResponseBody +// public Map getHistoryByTagmac(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId) +// { +// Map resultMap = new HashMap<>(); +//// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("PGINPGPERSONID",inPgPersonId); +//// PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId); +//// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode()); +// +// return resultMap; +// +// } +//} diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f7b5a0..e9d9c4e 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,13 +1,21 @@ package com.casic.PgInterface.rs; +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.manager.PGInOutRecManager; +import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; +import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager; +import com.casic.PgInterface.patroler.domain.PgInPgPerson; +import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; +import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import javax.ws.rs.*; import javax.ws.rs.core.MediaType; import java.util.HashMap; import java.util.Map; @@ -18,16 +26,44 @@ @Resource private PGInOutRecManager pgInOutRecManager; + @Resource + private PGTagPositionManager pgTagPositionManager; + @Resource + private PgInPgPersonManager pgInPgPersonManager; + @Resource + private PGTagMacManager pgTagMacManager; + @Resource + private PgInPgStatusManager pgInPgStatusManager; + + private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @POST @Path("query") @Produces(MediaType.APPLICATION_JSON) - public Map query(@RequestParam(value = "dtFrom", required = true) String dtFrom, - @RequestParam(value = "dtTo", required = true) String dtTo) + public Map query(@FormParam("dtFrom") String dtFrom, + @FormParam("dtTo") String dtTo) { Map resultMap = new HashMap<>(); resultMap = pgInOutRecManager.getInOutRec(dtFrom,dtTo); return resultMap; } + @POST + @Path("getRecentPosition") + @Produces(MediaType.APPLICATION_JSON) + public Map getRecentPosition(@FormParam("inPgPersonId") String inPgPersonId) + { + logger.info("param:"+inPgPersonId); + System.out.println("param:"+inPgPersonId); + Map resultMap = new HashMap<>(); + PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + 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)); + return resultMap; + } + } \ No newline at end of file