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 fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 ee6a724..6736304 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -6,28 +6,68 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { -// 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 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 tagMac; - public String tagName; - public String hostId; + public String getHostName() { + return HostName; + } + public void setHostName(String hostName) { + HostName = hostName; + } + public String getTagId() { + return TagId; + } - public String hostName; - public String tagId; - public String coordinatesId; - public String coordinatesName; - public String x; - public String y; + 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 String postionUpdateTime; @@ -40,132 +80,55 @@ "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; -// } -//// @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; + return TagMac; } - public void setTagMac(String tagMac) { - this.tagMac = tagMac; + TagMac = tagMac; } public String getTagName() { - return tagName; + return TagName; } - +// @JsonProperty(value ="tagName") public void setTagName(String tagName) { - this.tagName = tagName; + TagName = tagName; } public String getHostId() { - return hostId; + return HostId; } public void setHostId(String hostId) { - this.hostId = hostId; - } - public String getHostName() { - return hostName; + HostId = hostId; } - public void setHostName(String hostName) { - this.hostName = hostName; - } - public String getTagId() { - return tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getCoordinatesId() { - return coordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - this.coordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return coordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; - } - - public String getX() { - return x; - } - - public void setX(String x) { - this.x = x; - } - - public String getY() { - return y; - } - - public void setY(String y) { - this.y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - public PGTagPositionDto(PGTagPosition pgTagPosition) + 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()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setTagName(pgTagPosition.getTagName()); } + @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/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java index fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 ee6a724..6736304 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -6,28 +6,68 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { -// 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 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 tagMac; - public String tagName; - public String hostId; + public String getHostName() { + return HostName; + } + public void setHostName(String hostName) { + HostName = hostName; + } + public String getTagId() { + return TagId; + } - public String hostName; - public String tagId; - public String coordinatesId; - public String coordinatesName; - public String x; - public String y; + 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 String postionUpdateTime; @@ -40,132 +80,55 @@ "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; -// } -//// @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; + return TagMac; } - public void setTagMac(String tagMac) { - this.tagMac = tagMac; + TagMac = tagMac; } public String getTagName() { - return tagName; + return TagName; } - +// @JsonProperty(value ="tagName") public void setTagName(String tagName) { - this.tagName = tagName; + TagName = tagName; } public String getHostId() { - return hostId; + return HostId; } public void setHostId(String hostId) { - this.hostId = hostId; - } - public String getHostName() { - return hostName; + HostId = hostId; } - public void setHostName(String hostName) { - this.hostName = hostName; - } - public String getTagId() { - return tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getCoordinatesId() { - return coordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - this.coordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return coordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; - } - - public String getX() { - return x; - } - - public void setX(String x) { - this.x = x; - } - - public String getY() { - return y; - } - - public void setY(String y) { - this.y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - public PGTagPositionDto(PGTagPosition pgTagPosition) + 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()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setTagName(pgTagPosition.getTagName()); } + @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/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index 8b0e269..8fda3fe 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -4,6 +4,8 @@ import com.casic.PgInterface.patroler.domain.PgInPgStatus; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; /** * Created by yxw on 2018/4/2. @@ -20,6 +22,7 @@ private String inTime;//入廊时间 private String outTime;//出廊时间 private String inPgNum;//入廊次数 + private int timeout;//超时标记 public Long getPersonId() { return personId; @@ -101,6 +104,13 @@ this.outTime = outTime; } + public int getTimeout() { + return timeout; + } + public void setTimeout(int timeout) { + this.timeout = timeout; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -110,8 +120,17 @@ this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); this.setPersonType(pgInPgPerson.getPersonType()); - if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) + this.setTimeout(0); + if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) { this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } else this.setLastInTime(""); this.setInPgNum(String.valueOf(inPgNum)); @@ -124,10 +143,19 @@ this.setPhoneNumber(pgInPgStatus.getPgInPgPersonId().getPhoneNumber()); this.setPersonType(pgInPgStatus.getPgInPgPersonId().getPersonType()); this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setTimeout(0); if (pgInPgStatus.getOutTime() != null) this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); - else + else { this.setOutTime(""); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } } public PgInPgInfoDto() 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 fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 ee6a724..6736304 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -6,28 +6,68 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { -// 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 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 tagMac; - public String tagName; - public String hostId; + public String getHostName() { + return HostName; + } + public void setHostName(String hostName) { + HostName = hostName; + } + public String getTagId() { + return TagId; + } - public String hostName; - public String tagId; - public String coordinatesId; - public String coordinatesName; - public String x; - public String y; + 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 String postionUpdateTime; @@ -40,132 +80,55 @@ "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; -// } -//// @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; + return TagMac; } - public void setTagMac(String tagMac) { - this.tagMac = tagMac; + TagMac = tagMac; } public String getTagName() { - return tagName; + return TagName; } - +// @JsonProperty(value ="tagName") public void setTagName(String tagName) { - this.tagName = tagName; + TagName = tagName; } public String getHostId() { - return hostId; + return HostId; } public void setHostId(String hostId) { - this.hostId = hostId; - } - public String getHostName() { - return hostName; + HostId = hostId; } - public void setHostName(String hostName) { - this.hostName = hostName; - } - public String getTagId() { - return tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getCoordinatesId() { - return coordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - this.coordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return coordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; - } - - public String getX() { - return x; - } - - public void setX(String x) { - this.x = x; - } - - public String getY() { - return y; - } - - public void setY(String y) { - this.y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - public PGTagPositionDto(PGTagPosition pgTagPosition) + 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()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setTagName(pgTagPosition.getTagName()); } + @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/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index 8b0e269..8fda3fe 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -4,6 +4,8 @@ import com.casic.PgInterface.patroler.domain.PgInPgStatus; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; /** * Created by yxw on 2018/4/2. @@ -20,6 +22,7 @@ private String inTime;//入廊时间 private String outTime;//出廊时间 private String inPgNum;//入廊次数 + private int timeout;//超时标记 public Long getPersonId() { return personId; @@ -101,6 +104,13 @@ this.outTime = outTime; } + public int getTimeout() { + return timeout; + } + public void setTimeout(int timeout) { + this.timeout = timeout; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -110,8 +120,17 @@ this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); this.setPersonType(pgInPgPerson.getPersonType()); - if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) + this.setTimeout(0); + if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) { this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } else this.setLastInTime(""); this.setInPgNum(String.valueOf(inPgNum)); @@ -124,10 +143,19 @@ this.setPhoneNumber(pgInPgStatus.getPgInPgPersonId().getPhoneNumber()); this.setPersonType(pgInPgStatus.getPgInPgPersonId().getPersonType()); this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setTimeout(0); if (pgInPgStatus.getOutTime() != null) this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); - else + else { this.setOutTime(""); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } } public PgInPgInfoDto() diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 6c1254b..2d702e3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -63,7 +63,7 @@ PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGTagPositionDto(pgTagPosition)); + resultMap.put("result",new PGPositionDto(pgTagPosition)); System.out.println("test"); return resultMap; } 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 fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 ee6a724..6736304 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -6,28 +6,68 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { -// 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 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 tagMac; - public String tagName; - public String hostId; + public String getHostName() { + return HostName; + } + public void setHostName(String hostName) { + HostName = hostName; + } + public String getTagId() { + return TagId; + } - public String hostName; - public String tagId; - public String coordinatesId; - public String coordinatesName; - public String x; - public String y; + 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 String postionUpdateTime; @@ -40,132 +80,55 @@ "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; -// } -//// @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; + return TagMac; } - public void setTagMac(String tagMac) { - this.tagMac = tagMac; + TagMac = tagMac; } public String getTagName() { - return tagName; + return TagName; } - +// @JsonProperty(value ="tagName") public void setTagName(String tagName) { - this.tagName = tagName; + TagName = tagName; } public String getHostId() { - return hostId; + return HostId; } public void setHostId(String hostId) { - this.hostId = hostId; - } - public String getHostName() { - return hostName; + HostId = hostId; } - public void setHostName(String hostName) { - this.hostName = hostName; - } - public String getTagId() { - return tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getCoordinatesId() { - return coordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - this.coordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return coordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; - } - - public String getX() { - return x; - } - - public void setX(String x) { - this.x = x; - } - - public String getY() { - return y; - } - - public void setY(String y) { - this.y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - public PGTagPositionDto(PGTagPosition pgTagPosition) + 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()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setTagName(pgTagPosition.getTagName()); } + @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/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index 8b0e269..8fda3fe 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -4,6 +4,8 @@ import com.casic.PgInterface.patroler.domain.PgInPgStatus; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; /** * Created by yxw on 2018/4/2. @@ -20,6 +22,7 @@ private String inTime;//入廊时间 private String outTime;//出廊时间 private String inPgNum;//入廊次数 + private int timeout;//超时标记 public Long getPersonId() { return personId; @@ -101,6 +104,13 @@ this.outTime = outTime; } + public int getTimeout() { + return timeout; + } + public void setTimeout(int timeout) { + this.timeout = timeout; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -110,8 +120,17 @@ this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); this.setPersonType(pgInPgPerson.getPersonType()); - if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) + this.setTimeout(0); + if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) { this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } else this.setLastInTime(""); this.setInPgNum(String.valueOf(inPgNum)); @@ -124,10 +143,19 @@ this.setPhoneNumber(pgInPgStatus.getPgInPgPersonId().getPhoneNumber()); this.setPersonType(pgInPgStatus.getPgInPgPersonId().getPersonType()); this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setTimeout(0); if (pgInPgStatus.getOutTime() != null) this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); - else + else { this.setOutTime(""); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } } public PgInPgInfoDto() diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 6c1254b..2d702e3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -63,7 +63,7 @@ PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGTagPositionDto(pgTagPosition)); + resultMap.put("result",new PGPositionDto(pgTagPosition)); System.out.println("test"); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index b506338..2abc334 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; @@ -35,6 +36,9 @@ @Resource private PgDeviceManager pgDeviceManager; + @Resource + private PGTagMacManager pgTagMacManager; + /** * 派发工作证（新增入廊记录） */ @@ -54,6 +58,15 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); +// int iTagMac = pgTagMacManager.getCount("select count(1) from pg_tagmac where tagmac = ?",assetCode); +// if (0==iTagMac) +// { +// result = "false"; +// msg = "设备mac信息不存在"; +// resultMap.put("result", result); +// resultMap.put("msg", msg); +// return resultMap; +// } if (pgInPgPerson == null) { PgInPgPerson pgInPgPerson1=new PgInPgPerson(); 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 fc8ab1c..ef4da0d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -12,8 +12,25 @@ // public String TagId; // public String CoordinatesId; public String coordinatesName; - public String X; - public String Y; + + public String getX() { + return x; + } + + public void setX(String x) { + this.x = x; + } + + public String getY() { + return y; + } + + public void setY(String y) { + this.y = y; + } + + public String x; + public String y; public String positionUpdateTime; public String getTagMac() { @@ -56,21 +73,7 @@ this.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 getPositionUpdateTime() { return positionUpdateTime; @@ -81,6 +84,17 @@ } + public PGPositionDto(PGTagPosition pgTagPosition) + { + this.setX(pgTagPosition.getX()); + this.setY(pgTagPosition.getY()); + this.setTagName(pgTagPosition.getTagName()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setCoordinatesName(pgTagPosition.getCoordinatesName()); + this.setHostId(pgTagPosition.getHostId()); + this.setHostName(pgTagPosition.getHostName()); + } + @Override public String toString() { return "PGPositionDto{" + @@ -89,8 +103,8 @@ ", hostId='" + hostId + '\'' + ", hostName='" + hostName + '\'' + ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + X + '\'' + - ", Y='" + Y + '\'' + + ", X='" + x + '\'' + + ", Y='" + y + '\'' + ", postionUpdateTime='" + positionUpdateTime + '\'' + '}'; } 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 ee6a724..6736304 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -6,28 +6,68 @@ @JsonIgnoreProperties(ignoreUnknown = true) public class PGTagPositionDto { -// 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 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 tagMac; - public String tagName; - public String hostId; + public String getHostName() { + return HostName; + } + public void setHostName(String hostName) { + HostName = hostName; + } + public String getTagId() { + return TagId; + } - public String hostName; - public String tagId; - public String coordinatesId; - public String coordinatesName; - public String x; - public String y; + 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 String postionUpdateTime; @@ -40,132 +80,55 @@ "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; -// } -//// @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; + return TagMac; } - public void setTagMac(String tagMac) { - this.tagMac = tagMac; + TagMac = tagMac; } public String getTagName() { - return tagName; + return TagName; } - +// @JsonProperty(value ="tagName") public void setTagName(String tagName) { - this.tagName = tagName; + TagName = tagName; } public String getHostId() { - return hostId; + return HostId; } public void setHostId(String hostId) { - this.hostId = hostId; - } - public String getHostName() { - return hostName; + HostId = hostId; } - public void setHostName(String hostName) { - this.hostName = hostName; - } - public String getTagId() { - return tagId; - } - - public void setTagId(String tagId) { - this.tagId = tagId; - } - - public String getCoordinatesId() { - return coordinatesId; - } - - public void setCoordinatesId(String coordinatesId) { - this.coordinatesId = coordinatesId; - } - - public String getCoordinatesName() { - return coordinatesName; - } - - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; - } - - public String getX() { - return x; - } - - public void setX(String x) { - this.x = x; - } - - public String getY() { - return y; - } - - public void setY(String y) { - this.y = y; - } - - public String getPostionUpdateTime() { - return postionUpdateTime; - } public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - public PGTagPositionDto(PGTagPosition pgTagPosition) + 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()); + this.setTagMac(pgTagPosition.getTagMac()); + this.setTagName(pgTagPosition.getTagName()); } + @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/patroler/dto/PgInPgInfoDto.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java index 8b0e269..8fda3fe 100644 --- a/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java +++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgInPgInfoDto.java @@ -4,6 +4,8 @@ import com.casic.PgInterface.patroler.domain.PgInPgStatus; import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; /** * Created by yxw on 2018/4/2. @@ -20,6 +22,7 @@ private String inTime;//入廊时间 private String outTime;//出廊时间 private String inPgNum;//入廊次数 + private int timeout;//超时标记 public Long getPersonId() { return personId; @@ -101,6 +104,13 @@ this.outTime = outTime; } + public int getTimeout() { + return timeout; + } + public void setTimeout(int timeout) { + this.timeout = timeout; + } + public PgInPgInfoDto(PgInPgPerson pgInPgPerson, PgInPgStatus pgInPgStatus, int inPgNum) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -110,8 +120,17 @@ this.setPhoneNumber(pgInPgPerson.getPhoneNumber()); this.setIsInPg(String.valueOf(pgInPgPerson.getIsInPg())); this.setPersonType(pgInPgPerson.getPersonType()); - if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) + this.setTimeout(0); + if (pgInPgStatus!=null&&pgInPgStatus.getInTime() != null) { this.setLastInTime(sdf.format(pgInPgStatus.getInTime())); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } else this.setLastInTime(""); this.setInPgNum(String.valueOf(inPgNum)); @@ -124,10 +143,19 @@ this.setPhoneNumber(pgInPgStatus.getPgInPgPersonId().getPhoneNumber()); this.setPersonType(pgInPgStatus.getPgInPgPersonId().getPersonType()); this.setInTime(sdf.format(pgInPgStatus.getInTime())); + this.setTimeout(0); if (pgInPgStatus.getOutTime() != null) this.setOutTime(sdf.format(pgInPgStatus.getOutTime())); - else + else { this.setOutTime(""); + + Calendar calendar = Calendar.getInstance(); + calendar.setTime(pgInPgStatus.getInTime()); + calendar.add(Calendar.HOUR,1); + Date expectDate = calendar.getTime(); + Date now = new Date(); + this.setTimeout( 0 > expectDate.compareTo(now) && pgInPgStatus.getOutTime() ==null ? 1:0); + } } public PgInPgInfoDto() diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 6c1254b..2d702e3 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -63,7 +63,7 @@ PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGTagPositionDto(pgTagPosition)); + resultMap.put("result",new PGPositionDto(pgTagPosition)); System.out.println("test"); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index b506338..2abc334 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.devTable.dto.PgDeviceDto; import com.casic.PgInterface.devTable.manager.PgDeviceManager; +import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager; import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; @@ -35,6 +36,9 @@ @Resource private PgDeviceManager pgDeviceManager; + @Resource + private PGTagMacManager pgTagMacManager; + /** * 派发工作证（新增入廊记录） */ @@ -54,6 +58,15 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); +// int iTagMac = pgTagMacManager.getCount("select count(1) from pg_tagmac where tagmac = ?",assetCode); +// if (0==iTagMac) +// { +// result = "false"; +// msg = "设备mac信息不存在"; +// resultMap.put("result", result); +// resultMap.put("msg", msg); +// return resultMap; +// } if (pgInPgPerson == null) { PgInPgPerson pgInPgPerson1=new PgInPgPerson(); diff --git "a/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" index f227417..4ee2372 100644 --- "a/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" +++ "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" Binary files differ