diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); return resultMap; diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); 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 43e3244..486b49f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -58,11 +58,12 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); - int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); - if (0==iTagMac) + int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode); +// int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); + if (0==iHostName) { result = "false"; - msg = "设备mac信息不存在"; + msg = "设备信息不存在"; resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); 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 43e3244..486b49f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -58,11 +58,12 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); - int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); - if (0==iTagMac) + int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode); +// int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); + if (0==iHostName) { result = "false"; - msg = "设备mac信息不存在"; + msg = "设备信息不存在"; resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc83f4a..982e3d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,13 +11,15 @@ # ============================================================================ -# db +# dbd # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl -db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -db.default.username=PG -db.default.password=PG +db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl +#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu +db.default.username=scott +db.default.password=scott +#db.default.username=PG +#db.default.password=PG # ============================================================================ @@ -106,7 +108,8 @@ # ============================================================================ anthInput=Uradio:Ur@dio2018 auth=Base VXJhZGlvOlVyQGRpbzIwMTg= -GetTagStatusByHostID=http://www.uradiosys.com:8094/api/LocatingData/GetTagStatusByHostID -GetAreaInOutResult=http://www.uradiosys.com:8094/api/Statistics/GetAreaInOutResult -AllResult=http://www.uradiosys.com:8094/api/LocatingData/AllResult +GetTagStatusByHostID=http://172.17.0.119:8003/api/LocatingData/GetTagStatusByHostID +GetTagStatus=http://172.17.0.119:8003/api/LocatingData/GetTagStatus +GetAreaInOutResult=http://172.17.0.119:8003/api/Statistics/GetAreaInOutResult +AllResult=http://172.17.0.119:8003/api/LocatingData/AllResult httpTimeOut=90000 \ No newline at end of file diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); 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 43e3244..486b49f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -58,11 +58,12 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); - int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); - if (0==iTagMac) + int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode); +// int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); + if (0==iHostName) { result = "false"; - msg = "设备mac信息不存在"; + msg = "设备信息不存在"; resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc83f4a..982e3d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,13 +11,15 @@ # ============================================================================ -# db +# dbd # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl -db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -db.default.username=PG -db.default.password=PG +db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl +#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu +db.default.username=scott +db.default.password=scott +#db.default.username=PG +#db.default.password=PG # ============================================================================ @@ -106,7 +108,8 @@ # ============================================================================ anthInput=Uradio:Ur@dio2018 auth=Base VXJhZGlvOlVyQGRpbzIwMTg= -GetTagStatusByHostID=http://www.uradiosys.com:8094/api/LocatingData/GetTagStatusByHostID -GetAreaInOutResult=http://www.uradiosys.com:8094/api/Statistics/GetAreaInOutResult -AllResult=http://www.uradiosys.com:8094/api/LocatingData/AllResult +GetTagStatusByHostID=http://172.17.0.119:8003/api/LocatingData/GetTagStatusByHostID +GetTagStatus=http://172.17.0.119:8003/api/LocatingData/GetTagStatus +GetAreaInOutResult=http://172.17.0.119:8003/api/Statistics/GetAreaInOutResult +AllResult=http://172.17.0.119:8003/api/LocatingData/AllResult httpTimeOut=90000 \ No newline at end of file diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml index be87682..7a3aa5c 100644 --- a/src/main/resources/spring/taskConfig-applicationContext.xml +++ b/src/main/resources/spring/taskConfig-applicationContext.xml @@ -13,13 +13,13 @@ - + + + + + + + diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); 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 43e3244..486b49f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -58,11 +58,12 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); - int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); - if (0==iTagMac) + int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode); +// int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); + if (0==iHostName) { result = "false"; - msg = "设备mac信息不存在"; + msg = "设备信息不存在"; resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc83f4a..982e3d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,13 +11,15 @@ # ============================================================================ -# db +# dbd # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl -db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -db.default.username=PG -db.default.password=PG +db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl +#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu +db.default.username=scott +db.default.password=scott +#db.default.username=PG +#db.default.password=PG # ============================================================================ @@ -106,7 +108,8 @@ # ============================================================================ anthInput=Uradio:Ur@dio2018 auth=Base VXJhZGlvOlVyQGRpbzIwMTg= -GetTagStatusByHostID=http://www.uradiosys.com:8094/api/LocatingData/GetTagStatusByHostID -GetAreaInOutResult=http://www.uradiosys.com:8094/api/Statistics/GetAreaInOutResult -AllResult=http://www.uradiosys.com:8094/api/LocatingData/AllResult +GetTagStatusByHostID=http://172.17.0.119:8003/api/LocatingData/GetTagStatusByHostID +GetTagStatus=http://172.17.0.119:8003/api/LocatingData/GetTagStatus +GetAreaInOutResult=http://172.17.0.119:8003/api/Statistics/GetAreaInOutResult +AllResult=http://172.17.0.119:8003/api/LocatingData/AllResult httpTimeOut=90000 \ No newline at end of file diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml index be87682..7a3aa5c 100644 --- a/src/main/resources/spring/taskConfig-applicationContext.xml +++ b/src/main/resources/spring/taskConfig-applicationContext.xml @@ -13,13 +13,13 @@ - + + + + + + + diff --git a/tagMac.sql b/tagMac.sql deleted file mode 100644 index 163d9a2..0000000 --- a/tagMac.sql +++ /dev/null @@ -1,287 +0,0 @@ -prompt PL/SQL Developer Export Tables for user ZHYQ@XE -prompt Created by LenovoWork on 2019820 -set feedback off -set define off - -prompt Dropping PG_TAGMAC... -drop table PG_TAGMAC cascade constraints; -prompt Creating PG_TAGMAC... -create table PG_TAGMAC -( - id NUMBER(10) default 0 not null, - hostid VARCHAR2(20) not null, - hostname VARCHAR2(100), - tagmac VARCHAR2(30) not null, - tagmacname VARCHAR2(100) -) -tablespace ORACLEXE - pctfree 10 - initrans 1 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); -alter table PG_TAGMAC - add constraint TAGMAC_ID_PK primary key (ID) - using index - tablespace ORACLEXE - pctfree 10 - initrans 2 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); - -prompt Disabling triggers for PG_TAGMAC... -alter table PG_TAGMAC disable all triggers; -prompt Loading PG_TAGMAC... -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (381, '29', '姜洪良', 'B0:8E:1A:40:0A:7C', 'B0:8E:1A:40:0A:7C'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (382, '242', 'NB手环7405', '02:90:36:29:74:05', '02:90:36:29:74:05'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (383, '7', '董永平', 'B0:8E:1A:40:0F:90', '00010001'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (384, '194', 'ModelD2000', 'B0:8E:1A:00:00:00', 'B0:8E:1A:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (385, '240', '摔倒07CE', 'B0:8E:1A:41:07:CE', 'B0:8E:1A:41:07:CE'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (386, '248', '张大爷', 'B0:8E:1A:41:07:A0', 'B0:8E:1A:41:07:A0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (387, '229', '摔倒158A', 'B0:8E:1A:41:15:8A', 'B0:8E:1A:41:15:8A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (388, '231', '摔倒158B', 'B0:8E:1A:41:15:8B', 'B0:8E:1A:41:15:8B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (389, '241', '摔倒0794', 'B0:8E:1A:41:07:94', 'B0:8E:1A:41:07:94'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (390, '221', '石福林', 'B0:8E:1A:40:0A:87', 'B0:8E:1A:40:0A:87'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (391, '96', '马桶监测505488', 'B0:8E:1A:50:54:88', 'B0:8E:1A:50:54:88'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (392, '201', 'kkkkj', 'B0:8E:1A:40:0D:73', 'B0:8E:1A:40:0D:73'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (393, '222', 'B', 'B0:8E:1A:40:06:B0', 'B0:8E:1A:40:06:B0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (394, '202', 'ModelD360301', '36:03:01:00:00:00', '36:03:01:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (395, '210', '64', 'B0:8E:1A:41:1B:64', 'B0:8E:1A:41:1B:64'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (396, '113', '摔倒', 'B0:8E:1A:40:0F:1B', 'B0:8E:1A:40:0F:1B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (397, '125', '蓝牙信号测试', 'B0:8E:1A:40:04:C8', 'B0:8E:1A:40:04:C8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (398, '72', '吴家晟737', 'B0:8E:1A:40:0A:7D', 'B0:8E:1A:40:0A:7D'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (399, '97', '武娟', 'B0:8E:1A:40:0A:71', 'B0:8E:1A:40:0A:71'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (400, '145', 'Model-D 测试053A', 'B0:8E:1A:33:05:3A', 'B0:8E:1A:33:05:3A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (401, '170', 'Model-B test 0266', 'B0:8E:1A:36:02:66', 'B0:8E:1A:36:02:66'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (402, '232', 'model b F2', 'B0:8E:1A:36:01:F2', 'B0:8E:1A:36:01:F2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (403, '193', '吴晟', 'B0:8E:1A:41:10:EE', 'B0:8E:1A:41:10:EE'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (404, '197', 'ModelDV23602FC', '36:02:FC:00:00:00', '36:02:FC:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (405, '158', '测试卡片2', 'B0:8E:1A:40:21:92', 'B0:8E:1A:40:21:92'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (406, '246', '0C41', 'B0:8E:1A:41:0C:41', 'B0:8E:1A:41:0C:41'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (407, '223', '测试223', 'B0:8E:1A:40:0E:DC', 'B0:8E:1A:40:0E:DC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (408, '141', 'Model-D 测试051E', 'B0:8E:1A:33:05:1E', 'B0:8E:1A:33:05:1E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (409, '217', '董永平Model D', 'B0:8E:1A:36:02:FA', 'B0:8E:1A:36:02:FA'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (410, '148', 'Model_D 04F0（1-24）', 'B0:8E:1A:33:04:F0', 'B0:8E:1A:33:04:F0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (411, '178', '拉绳350035', 'B0:8E:1A:35:00:35', 'B0:8E:1A:35:00:35'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (412, '177', '拉绳350036', 'B0:8E:1A:35:00:36', 'B0:8E:1A:35:00:36'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (413, '133', '资产4FE8(9-26)', 'B0:8E:1A:50:4F:E8', 'B0:8E:1A:50:4F:E8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (414, '168', 'Model-B test 01D5', 'B0:8E:1A:36:01:D5', 'B0:8E:1A:36:01:D5'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (415, '174', '李全宝', 'B0:8E:1A:40:1A:B5', 'B0:8E:1A:40:1A:B5'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (416, '239', 'NB演示', '02:90:36:42:64:83', '02:90:36:42:64:83'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (417, '216', 'wifi蓝牙标签0333', 'B0:8E:1A:36:03:33', 'B0:8E:1A:36:03:33'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (418, '244', 'dyp10002', 'B0:8E:1A:36:03:30', '00010002'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (419, '64', '高燕', 'B0:8E:1A:40:0A:F2', 'B0:8E:1A:40:0A:F2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (420, '137', '黄-Model-D 0019', 'B0:8E:1A:40:0A:F7', 'B0:8E:1A:40:0A:F7'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (421, '167', '蔡曦铭', 'B0:8E:1A:40:0E:FF', 'B0:8E:1A:40:0E:FF'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (422, '247', '1315', 'B0:8E:1A:50:13:15', 'B0:8E:1A:50:13:15'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (423, '179', '梁琰佳', 'B0:8E:1A:40:0D:01', 'B0:8E:1A:40:0D:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (424, '31', '陆萍萍', 'B0:8E:1A:40:0F:95', 'B0:8E:1A:40:0F:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (425, '103', '黄东升', 'B0:8E:1A:41:09:08', 'B0:8E:1A:41:09:08'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (426, '131', 'ESP马桶检测000B', 'B0:8E:1A:40:00:0B', 'B0:8E:1A:40:00:0B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (427, '187', '1D60', 'B0:8E:1A:40:1D:60', 'B0:8E:1A:40:1D:60'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (428, '200', '9b', 'B0:8E:1A:41:11:9B', 'B0:8E:1A:41:11:9B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (429, '110', '摔倒0000', 'B0:8E:1A:40:00:00', 'B0:8E:1A:40:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (430, '111', '摔倒1126', 'B0:8E:1A:40:11:26', 'B0:8E:1A:40:11:26'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (431, '63', '时林虎', 'B0:8E:1A:40:0A:95', 'B0:8E:1A:40:0A:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (432, '155', 'model_b', 'B0:8E:1A:36:11:11', 'B0:8E:1A:36:11:11'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (433, '9', '杨亦铭', 'B0:8E:1A:40:0A:BB', 'B0:8E:1A:40:0A:BB'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (434, '150', 'Model_D 0434（1-24）', 'B0:8E:1A:33:04:34', 'B0:8E:1A:33:04:34'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (435, '245', '手环01', 'B0:8E:5A:00:00:01', 'B0:8E:5A:00:00:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (436, '196', 'ModeD3602FB', '36:02:FB:00:00:00', '36:02:FB:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (437, '45', '贡云炳', 'B0:8E:1A:40:0A:6F', 'B0:8E:1A:40:0A:6F'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (438, '224', '1589', 'B0:8E:1A:41:15:89', 'B0:8E:1A:41:15:89'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (439, '235', '雅马哈02', 'B0:8E:1A:36:03:10', 'B0:8E:1A:36:03:10'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (440, '84', '周乾', 'B0:8E:1A:40:0A:D4', 'B0:8E:1A:40:0A:D4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (441, '189', 'areoscout2', 'B0:8E:1A:41:01:D2', 'B0:8E:1A:41:01:D2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (442, '159', '测试卡片3', 'B0:8E:1A:40:22:2E', 'B0:8E:1A:40:22:2E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (443, '207', '52', 'B0:8E:1A:41:1B:52', 'B0:8E:1A:41:1B:52'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (444, '206', '56', 'B0:8E:1A:41:1B:56', 'B0:8E:1A:41:1B:56'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (445, '208', '5A', 'B0:8E:1A:41:1B:5A', 'B0:8E:1A:41:1B:5A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (446, '165', '李立峰', 'B0:8E:1A:40:0D:84', 'B0:8E:1A:40:0D:84'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (447, '106', 'test0980', 'B0:8E:1A:90:09:80', 'B0:8E:1A:90:09:80'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (448, '163', 'model_b004', 'B0:8E:1A:36:00:04', 'B0:8E:1A:36:00:04'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (449, '164', 'Model-B 0003', 'B0:8E:1A:36:00:03', 'B0:8E:1A:36:00:03'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (450, '160', 'ModelB02', 'B0:8E:1A:36:00:02', 'B0:8E:1A:36:00:02'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (451, '162', 'ModelB01', 'B0:8E:1A:36:00:01', 'B0:8E:1A:36:00:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (452, '161', 'ModelB00', 'B0:8E:1A:36:00:00', 'B0:8E:1A:36:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (453, '211', '3D', 'B0:8E:1A:41:1B:3D', 'B0:8E:1A:41:1B:3D'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (454, '107', 'test3C3B', 'B0:8E:1A:50:3C:3B', 'B0:8E:1A:50:3C:3B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (455, '171', '拉绳test 0006', 'B0:8E:1A:34:00:06', 'B0:8E:1A:34:00:06'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (456, '149', 'Model_D 0566（1-24）', 'B0:8E:1A:33:05:66', 'B0:8E:1A:33:05:66'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (457, '112', '谢晓威', 'B0:8E:1A:40:0D:B3', 'B0:8E:1A:40:0D:B3'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (458, '186', '0D68', 'B0:8E:1A:41:0D:68', 'B0:8E:1A:41:0D:68'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (459, '214', '蓝牙标签0129-360351', 'B0:8E:1A:36:03:51', 'B0:8E:1A:36:03:51'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (460, '151', 'Model_D 011A（1-24）', 'B0:8E:1A:33:01:1A', 'B0:8E:1A:33:01:1A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (461, '243', '楚云飞', 'B0:8E:1A:41:10:80', 'B0:8E:1A:41:10:80'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (462, '238', '3568', '02:90:30:35:35:68', '02:90:30:35:35:68'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (463, '144', 'Model-D 测试0548', 'B0:8E:1A:33:05:48', 'B0:8E:1A:33:05:48'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (464, '142', 'Model-D 测试0544', 'B0:8E:1A:33:05:44', 'B0:8E:1A:33:05:44'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (465, '153', 'NEWAPI4796', 'B0:8E:1A:50:47:96', 'B0:8E:1A:50:47:96'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (466, '225', '0019', 'B0:8E:1A:40:00:19', 'B0:8E:1A:40:00:19'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (467, '136', '测试0013', 'B0:8E:1A:40:00:13', 'B0:8E:1A:40:00:13'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (468, '135', '0015蓝牙标签(1103 17:00)', 'B0:8E:1A:40:00:15', 'B0:8E:1A:40:00:15'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (469, '138', '董-Model-D 0017', 'B0:8E:1A:40:00:17', 'B0:8E:1A:40:00:17'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (470, '139', '杨-Model-D 0016', 'B0:8E:1A:40:00:16', 'B0:8E:1A:40:00:16'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (471, '169', 'Model-B test 0295', 'B0:8E:1A:36:02:95', 'B0:8E:1A:36:02:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (472, '126', '蓝牙信号测试1', 'B0:8E:1A:40:0E:C8', 'B0:8E:1A:40:0E:C8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (473, '46', '龚丽珍', 'B0:8E:1A:40:0A:EB', 'B0:8E:1A:40:0A:EB'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (474, '236', '雅马哈03', 'B0:8E:1A:36:03:09', 'B0:8E:1A:36:03:09'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (475, '226', '雅马哈', 'B0:8E:1A:36:03:0C', 'B0:8E:1A:36:03:0C'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (476, '143', 'Model-D 测试05AC', 'B0:8E:1A:33:05:AC', 'B0:8E:1A:33:05:AC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (477, '203', '48', 'B0:8E:1A:41:1B:48', 'B0:8E:1A:41:1B:48'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (478, '205', '44', 'B0:8E:1A:41:1B:44', 'B0:8E:1A:41:1B:44'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (479, '212', '4A', 'B0:8E:1A:41:1B:4A', 'B0:8E:1A:41:1B:4A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (480, '209', '4B', 'B0:8E:1A:41:1B:4B', 'B0:8E:1A:41:1B:4B'); -commit; -prompt 100 records committed... -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (481, '204', '4E', 'B0:8E:1A:41:1B:4E', 'B0:8E:1A:41:1B:4E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (482, '234', '雅马哈01', 'B0:8E:1A:36:03:23', 'B0:8E:1A:36:03:23'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (483, '220', '蔡曦铭Model D', 'B0:8E:1A:36:03:2F', 'B0:8E:1A:36:03:2F'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (484, '152', 'Model_D 0406（1-24）', 'B0:8E:1A:33:04:06', 'B0:8E:1A:33:04:06'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (485, '147', 'Model_D 0404（1-24）', 'B0:8E:1A:33:04:04', 'B0:8E:1A:33:04:04'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (486, '166', '王思琦', 'B0:8E:1A:40:0D:75', 'B0:8E:1A:40:0D:75'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (487, '180', '潘桂成', 'B0:8E:1A:40:0D:77', 'B0:8E:1A:40:0D:77'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (488, '181', '伍树灼', 'B0:8E:1A:40:0D:76', 'B0:8E:1A:40:0D:76'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (489, '154', '渠立汉', 'B0:8E:1A:40:0A:A2', 'B0:8E:1A:40:0A:A2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (490, '146', '资产4FCA(1-5)', 'B0:8E:1A:50:4F:CA', 'B0:8E:1A:50:4F:CA'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (491, '188', 'areoscout1', 'B0:8E:1A:41:03:D4', 'B0:8E:1A:41:03:D4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (492, '192', '贡云炳Home', 'B0:8E:1A:41:0C:F4', 'B0:8E:1A:41:0C:F4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (493, '233', 'model b BC', 'B0:8E:1A:36:01:BC', 'B0:8E:1A:36:01:BC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (494, '104', '赵慧', 'B0:8E:1A:40:0A:C2', 'B0:8E:1A:40:0A:C2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (495, '195', 'ModelD360302', '36:03:02:00:00:00', '36:03:02:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (496, '237', '雅马哈04', 'B0:8E:1A:40:03:2E', 'B0:8E:1A:40:03:2E'); -commit; -prompt 116 records loaded -prompt Enabling triggers for PG_TAGMAC... -alter table PG_TAGMAC enable all triggers; - -set feedback on -set define on -prompt Done diff --git a/Scripts-InOutPG.sql b/Scripts-InOutPG.sql index f6ea548..23b1c8e 100644 --- a/Scripts-InOutPG.sql +++ b/Scripts-InOutPG.sql @@ -121,8 +121,8 @@ where a.pginpgpersonid = b.id and a.outtime is null and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 10 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 10 / 240 --tenMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); ret := SQL%ROWCOUNT; @@ -144,8 +144,8 @@ where a.pginpgpersonid = b.id and a.outtime = to_date(outTimeStr, 'yyyy-mm-dd hh24:mi:ss') and a.intime between - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 1 / 240 and - to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 1 / 240 --tenMinutes + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') - 20 / 240 and + to_date(inTimeStr, 'yyyy-mm-dd hh24:mi:ss') + 20 / 240 --twentyMinutes and upper(trim(b.assetcode)) = upper(trim(c.tagmac)) and c.hostId = hostIdIn); --TBD if exists pg_alarm (personId) then update active=0 @@ -156,4 +156,14 @@ create or replace view pg_InOutPG_record as select a.id,a.intime ,a.outtime,b.username,b.persontype from pg_inpg_status a,pg_inpg_person b -where a.pginpgpersonid=b.id \ No newline at end of file +where a.pginpgpersonid=b.id; + +create or replace view pg_position_tag_dev as +select a.*,b.partition , +substr(a.coordinatesname,instr(a.coordinatesname,'号分区')+3, +instr(a.coordinatesname,'K')-instr(a.coordinatesname,'号分区')-3) as binName + from pg_tagposition a, ( select distinct partition,pipegallery from pg_device ) b +where substr(a.coordinatesname,0,instr(a.coordinatesname,'号分区')-1) = b.pipegallery +union +select c.*, '离开区域' as partition,'离开区域' as binName from pg_tagposition c +where c.coordinatesname = '离开区域'; \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java index acb4a18..4cd41ad 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPosition.java @@ -25,6 +25,8 @@ private String positionUpdatetime; private Date parsedTime; // private Date queryTime; +// private String partition; +// private String binName; @Id // @GeneratedValue(strategy = GenerationType.AUTO) @GeneratedValue(strategy = GenerationType.SEQUENCE,generator ="SEQ_PG_TAGPOSITION_ID") @@ -155,5 +157,13 @@ // { // this.queryTime = queryTime; // } - +// @Basic +// @Column(name = "PARTITION") +// public String getPartition(){return partition;} +// public void setPartition(String partition) {this.partition = partition;} +// +// @Basic +// @Column(name = "BINNAME") +// public String getBinName(){return binName;} +// public void setBinName(String binName){ this.binName = binName; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java new file mode 100644 index 0000000..e0af436 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/domain/PGTagPositionView.java @@ -0,0 +1,117 @@ +package com.casic.PgInterface.overtimeInPG.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_POSITION_TAG_DEV") +public class PGTagPositionView implements Serializable { + private long id; + private String hostId; + private Date parsedTime; + private String X; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + @Column(name = "ID") + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + @Basic + @Column(name = "HOSTID") + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + @Basic + @Column(name = "PARSEDTIME") + public Date getParsedTime() { + return parsedTime; + } + + public void setParsedTime(Date parsedTime) { + this.parsedTime = parsedTime; + } + + @Basic + @Column(name = "X") + public String getX() { + return X; + } + + public void setX(String x) { + X = x; + } + + @Basic + @Column(name = "Y") + public String getY() { + return Y; + } + + public void setY(String y) { + Y = y; + } + + @Basic + @Column(name = "PARTITION") + public String getPartition() { + return partition; + } + + public void setPartition(String partition) { + this.partition = partition; + } + + @Basic + @Column(name = "BINNAME") + public String getBinName() { + return binName; + } + + public void setBinName(String binName) { + this.binName = binName; + } + + @Basic + @Column(name = "POSITIONUPDATETIME") + public String getPositionUpdateTime() { + return positionUpdateTime; + } + + public void setPositionUpdateTime(String positionUpdateTime) { + this.positionUpdateTime = positionUpdateTime; + } + + @Basic + @Column(name = "COORDINATESNAME") + public String getCoordinatesName() { + return coordinatesName; + } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + + + + + + +} 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 ef4da0d..7162394 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java @@ -93,6 +93,7 @@ this.setCoordinatesName(pgTagPosition.getCoordinatesName()); this.setHostId(pgTagPosition.getHostId()); this.setHostName(pgTagPosition.getHostName()); + this.setPositionUpdateTime(pgTagPosition.getPositionUpdatetime()); } @Override diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java index 625a73e..f848b0e 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionSimpleDto.java @@ -1,43 +1,60 @@ package com.casic.PgInterface.overtimeInPG.dto; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; -import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import java.util.ArrayList; +import java.util.List; public class PGPositionSimpleDto { - public String coordinatesName; + private String Y; + private String partition; + private String binName; + private String positionUpdateTime; + private String coordinatesName; + private long id; + + private String X; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } public String getX() { - return x; + return X; } public void setX(String x) { - this.x = x; + X = x; } public String getY() { - return y; + return Y; } public void setY(String y) { - this.y = y; + Y = y; } - public String x; - public String y; - public String positionUpdateTime; - - - - public String getCoordinatesName() { - return coordinatesName; + public String getPartition() { + return partition; } - public void setCoordinatesName(String coordinatesName) { - this.coordinatesName = coordinatesName; + public void setPartition(String partition) { + this.partition = partition; } + public String getBinName() { + return binName; + } + public void setBinName(String binName) { + this.binName = binName; + } public String getPositionUpdateTime() { return positionUpdateTime; @@ -47,21 +64,35 @@ this.positionUpdateTime = positionUpdateTime; } - -// public PGPositionSimpleDto(PGTagPosition pgTagPosition) -// { -// this.setX(pgTagPosition.getX()); -// this.setY(pgTagPosition.getY()); -// this.setCoordinatesName(pgTagPosition.getCoordinatesName()); -// } - - @Override - public String toString() { - return "PGPositionDto{" + - ", coordinatesName='" + coordinatesName + '\'' + - ", X='" + x + '\'' + - ", Y='" + y + '\'' + - ", postionUpdateTime='" + positionUpdateTime + '\'' + - '}'; + public String getCoordinatesName() { + return coordinatesName; } + + public void setCoordinatesName(String coordinatesName) { + this.coordinatesName = coordinatesName; + } + + public static PGPositionSimpleDto Convert2Simple (PGTagPositionView pgTagPositionView) + { + PGPositionSimpleDto pgPositionSimpleDto = new PGPositionSimpleDto(); + pgPositionSimpleDto.setBinName(pgTagPositionView.getBinName()); + pgPositionSimpleDto.setCoordinatesName(pgTagPositionView.getCoordinatesName()); + pgPositionSimpleDto.setId(pgTagPositionView.getId()); + pgPositionSimpleDto.setPartition(pgTagPositionView.getPartition()); + pgPositionSimpleDto.setPositionUpdateTime(pgTagPositionView.getPositionUpdateTime()); + pgPositionSimpleDto.setX(pgTagPositionView.getX()); + pgPositionSimpleDto.setY(pgTagPositionView.getY()); + return pgPositionSimpleDto; + } + + public static List Conver2SimpleList(List pgTagPositionViewList){ + List pgPositionSimpleDtoList = new ArrayList<>(); + for (PGTagPositionView pgTagPositionView : pgTagPositionViewList) + pgPositionSimpleDtoList.add(Convert2Simple(pgTagPositionView)); + return pgPositionSimpleDtoList; + } + + + + } 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 6736304..3d4f72a 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java @@ -108,13 +108,13 @@ public void setPostionUpdateTime(String postionUpdateTime) { this.postionUpdateTime = postionUpdateTime; } - - public PGTagPositionDto(PGTagPosition pgTagPosition) - { - this.setHostId(pgTagPosition.getHostId()); - this.setTagMac(pgTagPosition.getTagMac()); - this.setTagName(pgTagPosition.getTagName()); - } +// +// public PGTagPositionDto(PGTagPosition pgTagPosition) +// { +// this.setHostId(pgTagPosition.getHostId()); +// this.setTagMac(pgTagPosition.getTagMac()); +// this.setTagName(pgTagPosition.getTagName()); +// } @Override 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 418d77a..6660e8d 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java @@ -2,6 +2,7 @@ import com.casic.PgInterface.core.hibernate.HibernateEntityDao; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; +import com.casic.PgInterface.overtimeInPG.domain.PGTagPositionView; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; import com.casic.PgInterface.overtimeInPG.dto.PGPositionSimpleDto; import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto; @@ -50,18 +51,60 @@ String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'"; return ((BigDecimal)this.getSession().createSQLQuery(hSql).uniqueResult()).longValue(); } +// +// public Map getHisByHostId(Date inTime, Date outTime, String hostId) { +// Map retMap = new HashMap<>(); +// List pgPositionSimpleDtoList ; +// +// Criteria criteria = createCriteria(PGTagPosition.class); +// criteria.add(Restrictions.between("parsedtime",inTime,outTime)); +// criteria.add(Restrictions.eq("hostid",hostId)); +// criteria.addOrder(Order.asc("id")); +// pgPositionSimpleDtoList = criteria.list(); +// retMap.put("XY",pgPositionSimpleDtoList); +// return retMap; +// } - public Map getHisByHostId(Date inTime, Date outTime, String hostId) { + + public Map getHisByHostId(Date inTime, Date outTime, String hostId) + { Map retMap = new HashMap<>(); - List pgPositionSimpleDtoList ; + List pgPositionSimpleDtoList ; +// List pgPositionSimpleDtoList ; + String querySql = " select id,binName,partition,positionUpdateTime from pg_position_tag_dev " + +// "where hostid = 1 " + + "where parsedtime between ? and ? and hostid = ? " + + " order by id asc"; +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql); - Criteria criteria = createCriteria(PGTagPosition.class); - criteria.add(Restrictions.between("parsedtime",inTime,outTime)); - criteria.add(Restrictions.eq("hostid",hostId)); - criteria.addOrder(Order.asc("id")); - pgPositionSimpleDtoList = criteria.list(); + SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id") + .addScalar("binName").addScalar("positionUpdateTime").addScalar("partition") + .setResultTransformer(Transformers.ALIAS_TO_ENTITY_MAP); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).addScalar("id").setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); +// SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionSimpleDto.class)); + sqlQuery.setParameter(0,inTime); + sqlQuery.setParameter(1,outTime); + sqlQuery.setParameter(2,hostId); + pgPositionSimpleDtoList = sqlQuery.list(); + System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); retMap.put("XY",pgPositionSimpleDtoList); - return retMap; + return retMap; + } + + + public Map getHisByHostIdView(Date inTime, Date outTime, String hostId) + { + Map retMap = new HashMap<>(); + List pgTagPositionViewList ; + Criteria criteria = createCriteria(PGTagPositionView.class); + criteria.add(Restrictions.between("parsedTime",inTime,outTime)); + criteria.add(Restrictions.eq("hostId",hostId)); + criteria.addOrder(Order.asc("id")); + pgTagPositionViewList = criteria.list(); +// System.out.println("XY:"+ pgPositionSimpleDtoList.toString()); + retMap.put("XY",PGPositionSimpleDto.Conver2SimpleList(pgTagPositionViewList)); +// retMap.put("XY",criteria.list()); + return retMap; } } diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java index 3f66248..7cfb751 100644 --- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java +++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/TagmacRun.java @@ -1,5 +1,6 @@ package com.casic.PgInterface.overtimeInPG.task; +import com.casic.PgInterface.core.util.DateUtils; import com.casic.PgInterface.core.util.HttpClientUtils; import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.core.util.configProperty; @@ -35,9 +36,11 @@ private static final String authorizationInput = configProperty.getString("anthInput"); private static final String authorization =configProperty.getString("auth");//Base64加密 private static final String getTagMacUrl= configProperty.getString("GetTagStatusByHostID");//接口url + private static final String GetTagStatus= configProperty.getString("GetTagStatus");//接口url private static final String getInOutUrl=configProperty.getString("GetAreaInOutResult");//接口url private static final String getAllUrl=configProperty.getString("AllResult");//接口url private static final Logger logger = LoggerFactory.getLogger(TagmacRun.class); + private static final String nullTimeStr = "0001-01-01T00:00:00+08:00"; @Resource private PGTagMacManager pgTagMacManager; @Resource @@ -138,20 +141,23 @@ Date inTime = null; Date outTime = null; String sHostId = map.get("hostId").toString(); - String sInTime = map.get("inTime").toString().replace('T',' '); + String sInTime = map.get("inTime").toString(); String sOutTime = map.get("outTime").toString(); + if (nullTimeStr.equals(sInTime)&&nullTimeStr.equals(sOutTime)) + break; try { - inTime = simpleDateFormat.parse(sInTime); + inTime = simpleDateFormat.parse(sInTime.substring(0,19).replace('T',' ')); } catch (ParseException e) { e.printStackTrace(); } if (inTime != null && -1 == inTime.compareTo(limitDate) && StringUtils.isBlank(sOutTime)) { // pgTagMacManager.inPGalarm(sHostId, sInTime);//remove + System.out.println("overTime In PG"); } - if (StringUtils.isNotBlank(sOutTime)) + if (!nullTimeStr.equals(sOutTime) && StringUtils.isNotBlank(sOutTime)) { - sOutTime = sOutTime.replace('T',' '); + sOutTime = sOutTime.substring(0,19).replace('T',' '); try { outTime = simpleDateFormat.parse(sOutTime); } catch (ParseException e) { @@ -181,6 +187,48 @@ } return tagMac; } + + public PGTagPosition GetTagStatus(PGTagMac pgTagMac) + { + PGTagPosition pgTagPosition = new PGTagPosition(); + + TypeRef tagPositionType = new TypeRef() { + }; + String oneTagMac,tagMac = null; + oneTagMac = HttpClientUtils.get(GetTagStatus+"?tagMac="+pgTagMac.getTagMac(),authorization); + logger.info("Tag:"+oneTagMac); + if (StringUtils.isNotBlank(oneTagMac)) { +// ReadContext readContext = JsonPath.parse(oneTagMac); + ReadContext readContext = JsonPath.using(configuration).parse(oneTagMac); + if ("true".equals(readContext.read("$.Success",String.class))) { + PGTagPositionDto pgTagPositionDto = readContext.read("$['CoordinatesId','CoordinatesName','X','Y','postionUpdateTime']\"",tagPositionType); + + pgTagPosition.setHostId(pgTagMac.getHostId()); + pgTagPosition.setHostName(pgTagMac.getHostName()); + pgTagPosition.setTagMac(pgTagMac.getTagMac()); + pgTagPosition.setTagName(pgTagMac.getTagName()); + + pgTagPosition.setTagId(pgTagPositionDto.getTagId()); + pgTagPosition.setX(pgTagPositionDto.getX()); + pgTagPosition.setY(pgTagPositionDto.getY()); + pgTagPosition.setCoordinatesName(pgTagPositionDto.getCoordinatesName()); + pgTagPosition.setCoordinate(pgTagPositionDto.getCoordinatesId()); + + pgTagPosition.setPositionUpdatetime(pgTagPositionDto.getPostionUpdateTime()); + try { + pgTagPosition.setParsedTime(DateUtils.sdf4.parse(pgTagPositionDto.getPostionUpdateTime().substring(0,19).replace('T',' '))); + } catch (ParseException e) { + e.printStackTrace(); + } + } + } + + + return pgTagPosition; + } + + + public void getMinInTime() { logger.info("getInTime:"+pgTagMacManager.getMinInTime()); diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java index 1f9d058..0cf0f5a 100644 --- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java @@ -1,5 +1,7 @@ package com.casic.PgInterface.rs; +import com.casic.PgInterface.devTable.domain.PgDevice; +import com.casic.PgInterface.devTable.manager.PgDeviceManager; import com.casic.PgInterface.overtimeInPG.domain.PGTagMac; import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition; import com.casic.PgInterface.overtimeInPG.dto.PGPositionDto; @@ -7,15 +9,17 @@ 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.overtimeInPG.task.TagmacRun; 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.apache.commons.beanutils.BeanMap; +import net.sf.json.JSONObject; +//import org.apache.commons.beanutils.BeanMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestParam; +//import org.springframework.web.bind.annotation.RequestParam; import javax.annotation.Resource; import javax.ws.rs.*; @@ -38,6 +42,10 @@ private PGTagMacManager pgTagMacManager; @Resource private PgInPgStatusManager pgInPgStatusManager; + @Resource + private TagmacRun tagmacRun; + @Resource + private PgDeviceManager pgDeviceManager; private static Logger logger = LoggerFactory.getLogger(PGInOutRecRs.class); @@ -60,35 +68,58 @@ logger.info("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); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); +// long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac()); +// PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId); + PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac); + pgTagPositionManager.save(pgTagPosition); + + String coorName = pgTagPosition.getCoordinatesName(); + System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区"))); +// PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP"))); + PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区"))); + + Map resMap = new HashMap<>(); + JSONObject jsonObject = JSONObject.fromObject(new PGPositionDto(pgTagPosition)); + resMap.putAll(jsonObject); + resMap.put("partition",pgDevice == null ? coorName : pgDevice.getPartition()); + resMap.put("binName",pgDevice == null ? coorName:coorName.substring(coorName.indexOf("号分区")+3,coorName.indexOf("K"))); + resultMap.put("msg","success"); // resultMap.put("result",pgTagPosition); - resultMap.put("result",new PGPositionDto(pgTagPosition)); +// resultMap.put("result",new PGPositionDto(pgTagPosition)); + resultMap.put("result",resMap); return resultMap; } @POST - @Path("getRecentPosition") + @Path("getHistoryByTagmac") @Produces(MediaType.APPLICATION_JSON) public Map getHistoryByTagmac(@FormParam("inPgPersonId") String inPgPersonId) { logger.info("param:"+inPgPersonId); Map resultMap = new HashMap<>(); PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(Long.valueOf(inPgPersonId)); - PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pginpgpersonid",inPgPersonId); - PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",pgInPgPerson); + System.out.println("time:"+pgInPgStatus.getInTime()); +// PgInPgStatus pgInPgStatus = pgInPgStatusManager.findUniqueBy("pgInPgPersonId",inPgPersonId); +// PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("tagMac",pgInPgPerson.getAssetCode()); + PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("hostName",pgInPgPerson.getAssetCode()); Map mapPosition = new HashMap<>(); if(pgInPgStatus.getOutTime() == null) - mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); + mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); else mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); +// if(pgInPgStatus.getOutTime() == null) +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId()); +// else +// mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId()); - BeanMap mapTag = new BeanMap(pgTagMac); - mapPosition.putAll(mapTag); - + JSONObject jsonObject = JSONObject.fromObject(pgTagMac); + jsonObject.remove("id"); + mapPosition.putAll(jsonObject); resultMap.put("msg","success"); resultMap.put("result",mapPosition); 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 43e3244..486b49f 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -58,11 +58,12 @@ try { PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); - int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); - if (0==iTagMac) + int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode); +// int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase()); + if (0==iHostName) { result = "false"; - msg = "设备mac信息不存在"; + msg = "设备信息不存在"; resultMap.put("result", result); resultMap.put("msg", msg); return resultMap; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc83f4a..982e3d9 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -11,13 +11,15 @@ # ============================================================================ -# db +# dbd # ============================================================================ db.default.driverClassName=oracle.jdbc.driver.OracleDriver -#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl -db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu -db.default.username=PG -db.default.password=PG +db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl +#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu +db.default.username=scott +db.default.password=scott +#db.default.username=PG +#db.default.password=PG # ============================================================================ @@ -106,7 +108,8 @@ # ============================================================================ anthInput=Uradio:Ur@dio2018 auth=Base VXJhZGlvOlVyQGRpbzIwMTg= -GetTagStatusByHostID=http://www.uradiosys.com:8094/api/LocatingData/GetTagStatusByHostID -GetAreaInOutResult=http://www.uradiosys.com:8094/api/Statistics/GetAreaInOutResult -AllResult=http://www.uradiosys.com:8094/api/LocatingData/AllResult +GetTagStatusByHostID=http://172.17.0.119:8003/api/LocatingData/GetTagStatusByHostID +GetTagStatus=http://172.17.0.119:8003/api/LocatingData/GetTagStatus +GetAreaInOutResult=http://172.17.0.119:8003/api/Statistics/GetAreaInOutResult +AllResult=http://172.17.0.119:8003/api/LocatingData/AllResult httpTimeOut=90000 \ No newline at end of file diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml index be87682..7a3aa5c 100644 --- a/src/main/resources/spring/taskConfig-applicationContext.xml +++ b/src/main/resources/spring/taskConfig-applicationContext.xml @@ -13,13 +13,13 @@ - + + + + + + + diff --git a/tagMac.sql b/tagMac.sql deleted file mode 100644 index 163d9a2..0000000 --- a/tagMac.sql +++ /dev/null @@ -1,287 +0,0 @@ -prompt PL/SQL Developer Export Tables for user ZHYQ@XE -prompt Created by LenovoWork on 2019820 -set feedback off -set define off - -prompt Dropping PG_TAGMAC... -drop table PG_TAGMAC cascade constraints; -prompt Creating PG_TAGMAC... -create table PG_TAGMAC -( - id NUMBER(10) default 0 not null, - hostid VARCHAR2(20) not null, - hostname VARCHAR2(100), - tagmac VARCHAR2(30) not null, - tagmacname VARCHAR2(100) -) -tablespace ORACLEXE - pctfree 10 - initrans 1 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); -alter table PG_TAGMAC - add constraint TAGMAC_ID_PK primary key (ID) - using index - tablespace ORACLEXE - pctfree 10 - initrans 2 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); - -prompt Disabling triggers for PG_TAGMAC... -alter table PG_TAGMAC disable all triggers; -prompt Loading PG_TAGMAC... -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (381, '29', '姜洪良', 'B0:8E:1A:40:0A:7C', 'B0:8E:1A:40:0A:7C'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (382, '242', 'NB手环7405', '02:90:36:29:74:05', '02:90:36:29:74:05'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (383, '7', '董永平', 'B0:8E:1A:40:0F:90', '00010001'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (384, '194', 'ModelD2000', 'B0:8E:1A:00:00:00', 'B0:8E:1A:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (385, '240', '摔倒07CE', 'B0:8E:1A:41:07:CE', 'B0:8E:1A:41:07:CE'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (386, '248', '张大爷', 'B0:8E:1A:41:07:A0', 'B0:8E:1A:41:07:A0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (387, '229', '摔倒158A', 'B0:8E:1A:41:15:8A', 'B0:8E:1A:41:15:8A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (388, '231', '摔倒158B', 'B0:8E:1A:41:15:8B', 'B0:8E:1A:41:15:8B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (389, '241', '摔倒0794', 'B0:8E:1A:41:07:94', 'B0:8E:1A:41:07:94'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (390, '221', '石福林', 'B0:8E:1A:40:0A:87', 'B0:8E:1A:40:0A:87'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (391, '96', '马桶监测505488', 'B0:8E:1A:50:54:88', 'B0:8E:1A:50:54:88'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (392, '201', 'kkkkj', 'B0:8E:1A:40:0D:73', 'B0:8E:1A:40:0D:73'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (393, '222', 'B', 'B0:8E:1A:40:06:B0', 'B0:8E:1A:40:06:B0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (394, '202', 'ModelD360301', '36:03:01:00:00:00', '36:03:01:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (395, '210', '64', 'B0:8E:1A:41:1B:64', 'B0:8E:1A:41:1B:64'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (396, '113', '摔倒', 'B0:8E:1A:40:0F:1B', 'B0:8E:1A:40:0F:1B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (397, '125', '蓝牙信号测试', 'B0:8E:1A:40:04:C8', 'B0:8E:1A:40:04:C8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (398, '72', '吴家晟737', 'B0:8E:1A:40:0A:7D', 'B0:8E:1A:40:0A:7D'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (399, '97', '武娟', 'B0:8E:1A:40:0A:71', 'B0:8E:1A:40:0A:71'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (400, '145', 'Model-D 测试053A', 'B0:8E:1A:33:05:3A', 'B0:8E:1A:33:05:3A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (401, '170', 'Model-B test 0266', 'B0:8E:1A:36:02:66', 'B0:8E:1A:36:02:66'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (402, '232', 'model b F2', 'B0:8E:1A:36:01:F2', 'B0:8E:1A:36:01:F2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (403, '193', '吴晟', 'B0:8E:1A:41:10:EE', 'B0:8E:1A:41:10:EE'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (404, '197', 'ModelDV23602FC', '36:02:FC:00:00:00', '36:02:FC:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (405, '158', '测试卡片2', 'B0:8E:1A:40:21:92', 'B0:8E:1A:40:21:92'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (406, '246', '0C41', 'B0:8E:1A:41:0C:41', 'B0:8E:1A:41:0C:41'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (407, '223', '测试223', 'B0:8E:1A:40:0E:DC', 'B0:8E:1A:40:0E:DC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (408, '141', 'Model-D 测试051E', 'B0:8E:1A:33:05:1E', 'B0:8E:1A:33:05:1E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (409, '217', '董永平Model D', 'B0:8E:1A:36:02:FA', 'B0:8E:1A:36:02:FA'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (410, '148', 'Model_D 04F0（1-24）', 'B0:8E:1A:33:04:F0', 'B0:8E:1A:33:04:F0'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (411, '178', '拉绳350035', 'B0:8E:1A:35:00:35', 'B0:8E:1A:35:00:35'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (412, '177', '拉绳350036', 'B0:8E:1A:35:00:36', 'B0:8E:1A:35:00:36'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (413, '133', '资产4FE8(9-26)', 'B0:8E:1A:50:4F:E8', 'B0:8E:1A:50:4F:E8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (414, '168', 'Model-B test 01D5', 'B0:8E:1A:36:01:D5', 'B0:8E:1A:36:01:D5'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (415, '174', '李全宝', 'B0:8E:1A:40:1A:B5', 'B0:8E:1A:40:1A:B5'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (416, '239', 'NB演示', '02:90:36:42:64:83', '02:90:36:42:64:83'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (417, '216', 'wifi蓝牙标签0333', 'B0:8E:1A:36:03:33', 'B0:8E:1A:36:03:33'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (418, '244', 'dyp10002', 'B0:8E:1A:36:03:30', '00010002'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (419, '64', '高燕', 'B0:8E:1A:40:0A:F2', 'B0:8E:1A:40:0A:F2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (420, '137', '黄-Model-D 0019', 'B0:8E:1A:40:0A:F7', 'B0:8E:1A:40:0A:F7'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (421, '167', '蔡曦铭', 'B0:8E:1A:40:0E:FF', 'B0:8E:1A:40:0E:FF'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (422, '247', '1315', 'B0:8E:1A:50:13:15', 'B0:8E:1A:50:13:15'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (423, '179', '梁琰佳', 'B0:8E:1A:40:0D:01', 'B0:8E:1A:40:0D:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (424, '31', '陆萍萍', 'B0:8E:1A:40:0F:95', 'B0:8E:1A:40:0F:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (425, '103', '黄东升', 'B0:8E:1A:41:09:08', 'B0:8E:1A:41:09:08'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (426, '131', 'ESP马桶检测000B', 'B0:8E:1A:40:00:0B', 'B0:8E:1A:40:00:0B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (427, '187', '1D60', 'B0:8E:1A:40:1D:60', 'B0:8E:1A:40:1D:60'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (428, '200', '9b', 'B0:8E:1A:41:11:9B', 'B0:8E:1A:41:11:9B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (429, '110', '摔倒0000', 'B0:8E:1A:40:00:00', 'B0:8E:1A:40:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (430, '111', '摔倒1126', 'B0:8E:1A:40:11:26', 'B0:8E:1A:40:11:26'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (431, '63', '时林虎', 'B0:8E:1A:40:0A:95', 'B0:8E:1A:40:0A:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (432, '155', 'model_b', 'B0:8E:1A:36:11:11', 'B0:8E:1A:36:11:11'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (433, '9', '杨亦铭', 'B0:8E:1A:40:0A:BB', 'B0:8E:1A:40:0A:BB'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (434, '150', 'Model_D 0434（1-24）', 'B0:8E:1A:33:04:34', 'B0:8E:1A:33:04:34'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (435, '245', '手环01', 'B0:8E:5A:00:00:01', 'B0:8E:5A:00:00:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (436, '196', 'ModeD3602FB', '36:02:FB:00:00:00', '36:02:FB:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (437, '45', '贡云炳', 'B0:8E:1A:40:0A:6F', 'B0:8E:1A:40:0A:6F'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (438, '224', '1589', 'B0:8E:1A:41:15:89', 'B0:8E:1A:41:15:89'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (439, '235', '雅马哈02', 'B0:8E:1A:36:03:10', 'B0:8E:1A:36:03:10'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (440, '84', '周乾', 'B0:8E:1A:40:0A:D4', 'B0:8E:1A:40:0A:D4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (441, '189', 'areoscout2', 'B0:8E:1A:41:01:D2', 'B0:8E:1A:41:01:D2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (442, '159', '测试卡片3', 'B0:8E:1A:40:22:2E', 'B0:8E:1A:40:22:2E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (443, '207', '52', 'B0:8E:1A:41:1B:52', 'B0:8E:1A:41:1B:52'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (444, '206', '56', 'B0:8E:1A:41:1B:56', 'B0:8E:1A:41:1B:56'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (445, '208', '5A', 'B0:8E:1A:41:1B:5A', 'B0:8E:1A:41:1B:5A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (446, '165', '李立峰', 'B0:8E:1A:40:0D:84', 'B0:8E:1A:40:0D:84'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (447, '106', 'test0980', 'B0:8E:1A:90:09:80', 'B0:8E:1A:90:09:80'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (448, '163', 'model_b004', 'B0:8E:1A:36:00:04', 'B0:8E:1A:36:00:04'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (449, '164', 'Model-B 0003', 'B0:8E:1A:36:00:03', 'B0:8E:1A:36:00:03'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (450, '160', 'ModelB02', 'B0:8E:1A:36:00:02', 'B0:8E:1A:36:00:02'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (451, '162', 'ModelB01', 'B0:8E:1A:36:00:01', 'B0:8E:1A:36:00:01'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (452, '161', 'ModelB00', 'B0:8E:1A:36:00:00', 'B0:8E:1A:36:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (453, '211', '3D', 'B0:8E:1A:41:1B:3D', 'B0:8E:1A:41:1B:3D'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (454, '107', 'test3C3B', 'B0:8E:1A:50:3C:3B', 'B0:8E:1A:50:3C:3B'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (455, '171', '拉绳test 0006', 'B0:8E:1A:34:00:06', 'B0:8E:1A:34:00:06'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (456, '149', 'Model_D 0566（1-24）', 'B0:8E:1A:33:05:66', 'B0:8E:1A:33:05:66'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (457, '112', '谢晓威', 'B0:8E:1A:40:0D:B3', 'B0:8E:1A:40:0D:B3'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (458, '186', '0D68', 'B0:8E:1A:41:0D:68', 'B0:8E:1A:41:0D:68'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (459, '214', '蓝牙标签0129-360351', 'B0:8E:1A:36:03:51', 'B0:8E:1A:36:03:51'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (460, '151', 'Model_D 011A（1-24）', 'B0:8E:1A:33:01:1A', 'B0:8E:1A:33:01:1A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (461, '243', '楚云飞', 'B0:8E:1A:41:10:80', 'B0:8E:1A:41:10:80'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (462, '238', '3568', '02:90:30:35:35:68', '02:90:30:35:35:68'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (463, '144', 'Model-D 测试0548', 'B0:8E:1A:33:05:48', 'B0:8E:1A:33:05:48'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (464, '142', 'Model-D 测试0544', 'B0:8E:1A:33:05:44', 'B0:8E:1A:33:05:44'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (465, '153', 'NEWAPI4796', 'B0:8E:1A:50:47:96', 'B0:8E:1A:50:47:96'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (466, '225', '0019', 'B0:8E:1A:40:00:19', 'B0:8E:1A:40:00:19'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (467, '136', '测试0013', 'B0:8E:1A:40:00:13', 'B0:8E:1A:40:00:13'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (468, '135', '0015蓝牙标签(1103 17:00)', 'B0:8E:1A:40:00:15', 'B0:8E:1A:40:00:15'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (469, '138', '董-Model-D 0017', 'B0:8E:1A:40:00:17', 'B0:8E:1A:40:00:17'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (470, '139', '杨-Model-D 0016', 'B0:8E:1A:40:00:16', 'B0:8E:1A:40:00:16'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (471, '169', 'Model-B test 0295', 'B0:8E:1A:36:02:95', 'B0:8E:1A:36:02:95'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (472, '126', '蓝牙信号测试1', 'B0:8E:1A:40:0E:C8', 'B0:8E:1A:40:0E:C8'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (473, '46', '龚丽珍', 'B0:8E:1A:40:0A:EB', 'B0:8E:1A:40:0A:EB'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (474, '236', '雅马哈03', 'B0:8E:1A:36:03:09', 'B0:8E:1A:36:03:09'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (475, '226', '雅马哈', 'B0:8E:1A:36:03:0C', 'B0:8E:1A:36:03:0C'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (476, '143', 'Model-D 测试05AC', 'B0:8E:1A:33:05:AC', 'B0:8E:1A:33:05:AC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (477, '203', '48', 'B0:8E:1A:41:1B:48', 'B0:8E:1A:41:1B:48'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (478, '205', '44', 'B0:8E:1A:41:1B:44', 'B0:8E:1A:41:1B:44'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (479, '212', '4A', 'B0:8E:1A:41:1B:4A', 'B0:8E:1A:41:1B:4A'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (480, '209', '4B', 'B0:8E:1A:41:1B:4B', 'B0:8E:1A:41:1B:4B'); -commit; -prompt 100 records committed... -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (481, '204', '4E', 'B0:8E:1A:41:1B:4E', 'B0:8E:1A:41:1B:4E'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (482, '234', '雅马哈01', 'B0:8E:1A:36:03:23', 'B0:8E:1A:36:03:23'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (483, '220', '蔡曦铭Model D', 'B0:8E:1A:36:03:2F', 'B0:8E:1A:36:03:2F'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (484, '152', 'Model_D 0406（1-24）', 'B0:8E:1A:33:04:06', 'B0:8E:1A:33:04:06'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (485, '147', 'Model_D 0404（1-24）', 'B0:8E:1A:33:04:04', 'B0:8E:1A:33:04:04'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (486, '166', '王思琦', 'B0:8E:1A:40:0D:75', 'B0:8E:1A:40:0D:75'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (487, '180', '潘桂成', 'B0:8E:1A:40:0D:77', 'B0:8E:1A:40:0D:77'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (488, '181', '伍树灼', 'B0:8E:1A:40:0D:76', 'B0:8E:1A:40:0D:76'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (489, '154', '渠立汉', 'B0:8E:1A:40:0A:A2', 'B0:8E:1A:40:0A:A2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (490, '146', '资产4FCA(1-5)', 'B0:8E:1A:50:4F:CA', 'B0:8E:1A:50:4F:CA'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (491, '188', 'areoscout1', 'B0:8E:1A:41:03:D4', 'B0:8E:1A:41:03:D4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (492, '192', '贡云炳Home', 'B0:8E:1A:41:0C:F4', 'B0:8E:1A:41:0C:F4'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (493, '233', 'model b BC', 'B0:8E:1A:36:01:BC', 'B0:8E:1A:36:01:BC'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (494, '104', '赵慧', 'B0:8E:1A:40:0A:C2', 'B0:8E:1A:40:0A:C2'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (495, '195', 'ModelD360302', '36:03:02:00:00:00', '36:03:02:00:00:00'); -insert into PG_TAGMAC (id, hostid, hostname, tagmac, tagmacname) -values (496, '237', '雅马哈04', 'B0:8E:1A:40:03:2E', 'B0:8E:1A:40:03:2E'); -commit; -prompt 116 records loaded -prompt Enabling triggers for PG_TAGMAC... -alter table PG_TAGMAC enable all triggers; - -set feedback on -set define on -prompt Done diff --git a/tagPosition.sql b/tagPosition.sql deleted file mode 100644 index ae9ba82..0000000 --- a/tagPosition.sql +++ /dev/null @@ -1,592 +0,0 @@ -prompt PL/SQL Developer Export Tables for user ZHYQ@XE -prompt Created by LenovoWork on 20190709 -set feedback off -set define off - -prompt Dropping PG_TAGPOSITION... -drop table PG_TAGPOSITION cascade constraints; -prompt Creating PG_TAGPOSITION... -create table PG_TAGPOSITION -( - id NUMBER(11) default 0 not null, - hostid VARCHAR2(20) not null, - hostname VARCHAR2(100), - tagid VARCHAR2(20) not null, - tagmac VARCHAR2(30) not null, - tagmacname VARCHAR2(100), - coordinatesname VARCHAR2(100), - coordinate VARCHAR2(20), - x VARCHAR2(30), - y VARCHAR2(30), - positionupdatetime VARCHAR2(40), - parsedtime DATE, - querytime DATE default sysdate -) -tablespace USERS - pctfree 10 - initrans 1 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); -create index QUERYTIME_IDX on PG_TAGPOSITION (QUERYTIME) - tablespace USERS - pctfree 10 - initrans 2 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); -alter table PG_TAGPOSITION - add constraint TAGPOSITION_ID_PK primary key (ID) - using index - tablespace USERS - pctfree 10 - initrans 2 - maxtrans 255 - storage - ( - initial 64K - next 1M - minextents 1 - maxextents unlimited - ); - -prompt Disabling triggers for PG_TAGPOSITION... -alter table PG_TAGPOSITION disable all triggers; -prompt Loading PG_TAGPOSITION... -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (194, '112', '谢晓威', '14449', 'B0:8E:1A:40:0D:B3', 'B0:8E:1A:40:0D:B3', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4273762+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (195, '186', '0D68', '27260', 'B0:8E:1A:41:0D:68', 'B0:8E:1A:41:0D:68', null, '1160', '-3.7899999618530273', '-3.869999885559082', '2019-07-08T13:32:55.6406975+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (196, '214', '蓝牙标签0129-360351', '30420', 'B0:8E:1A:36:03:51', 'B0:8E:1A:36:03:51', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:07.2298563+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (197, '151', 'Model_D 011A（1-24）', '17745', 'B0:8E:1A:33:01:1A', 'B0:8E:1A:33:01:1A', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5383873+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (198, '243', '楚云飞', '27776', 'B0:8E:1A:41:10:80', 'B0:8E:1A:41:10:80', null, '33', '40.84', '39.54', '2019-07-09T09:34:00.7033423+08:00', to_date('09-07-2019 09:34:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (199, '238', '3568', '32059', '02:90:30:35:35:68', '02:90:30:35:35:68', null, '1242', '-91.06999969482422', '-37.7400016784668', '2019-07-08T13:33:13.2344567+08:00', to_date('08-07-2019 13:33:13', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (200, '144', 'Model-D 测试0548', '17429', 'B0:8E:1A:33:05:48', 'B0:8E:1A:33:05:48', null, '38', '-85.63287353515625', '-23.543903350830078', '2019-07-08T13:32:52.5123847+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (201, '142', 'Model-D 测试0544', '17399', 'B0:8E:1A:33:05:44', 'B0:8E:1A:33:05:44', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.4923827+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (202, '153', 'NEWAPI4796', '11449', 'B0:8E:1A:50:47:96', 'B0:8E:1A:50:47:96', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.2043539+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (203, '225', '0019', '14130', 'B0:8E:1A:40:00:19', 'B0:8E:1A:40:00:19', null, '0', '-1.0', '-1.0', '2019-07-08T13:32:52.3843719+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (204, '136', '测试0013', '16423', 'B0:8E:1A:40:00:13', 'B0:8E:1A:40:00:13', null, '33', '-44.05439376831055', '-38.5018424987793', '2019-07-08T13:32:52.4693804+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (205, '135', '0015蓝牙标签(1103 17:00)', '14145', 'B0:8E:1A:40:00:15', 'B0:8E:1A:40:00:15', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.3923727+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (206, '138', '董-Model-D 0017', '14096', 'B0:8E:1A:40:00:17', 'B0:8E:1A:40:00:17', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:32:52.36537+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (207, '139', '杨-Model-D 0016', '14100', 'B0:8E:1A:40:00:16', 'B0:8E:1A:40:00:16', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.3743709+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (208, '169', 'Model-B test 0295', '21494', 'B0:8E:1A:36:02:95', 'B0:8E:1A:36:02:95', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6904025+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (209, '126', '蓝牙信号测试1', '12844', 'B0:8E:1A:40:0E:C8', 'B0:8E:1A:40:0E:C8', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.3143649+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (210, '46', '龚丽珍', '11408', 'B0:8E:1A:40:0A:EB', 'B0:8E:1A:40:0A:EB', null, '21', '27.66', '35.05', '2019-07-09T09:34:00.6953415+08:00', to_date('09-07-2019 09:34:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (211, '236', '雅马哈03', '30403', 'B0:8E:1A:36:03:09', 'B0:8E:1A:36:03:09', null, '1237', '-205.69000244140625', '-202.38999938964844', '2019-07-08T13:33:07.1658499+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (212, '226', '雅马哈', '30389', 'B0:8E:1A:36:03:0C', 'B0:8E:1A:36:03:0C', null, '1230', '-73.38999938964844', '-53.91999816894531', '2019-07-08T13:33:07.1118445+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (213, '143', 'Model-D 测试05AC', '17457', 'B0:8E:1A:33:05:AC', 'B0:8E:1A:33:05:AC', null, '868', '-85.16999816894531', '-26.760000228881836', '2019-07-08T13:32:52.5203855+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (214, '203', '48', '29189', 'B0:8E:1A:41:1B:48', 'B0:8E:1A:41:1B:48', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7244058+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (215, '205', '44', '29190', 'B0:8E:1A:41:1B:44', 'B0:8E:1A:41:1B:44', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7304064+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (216, '212', '4A', '29213', 'B0:8E:1A:41:1B:4A', 'B0:8E:1A:41:1B:4A', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8214155+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (217, '209', '4B', '29198', 'B0:8E:1A:41:1B:4B', 'B0:8E:1A:41:1B:4B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7654099+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (218, '204', '4E', '29217', 'B0:8E:1A:41:1B:4E', 'B0:8E:1A:41:1B:4E', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8394173+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (219, '234', '雅马哈01', '30498', 'B0:8E:1A:36:03:23', 'B0:8E:1A:36:03:23', null, '0', '0.0', '0.0', '2019-07-08T13:33:07.5108844+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (220, '220', '蔡曦铭Model D', '30382', 'B0:8E:1A:36:03:2F', 'B0:8E:1A:36:03:2F', null, '1237', '205.69000244140625', '202.38999938964844', '2019-07-08T13:33:07.0858419+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (221, '152', 'Model_D 0406（1-24）', '17772', 'B0:8E:1A:33:04:06', 'B0:8E:1A:33:04:06', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.555389+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (222, '147', 'Model_D 0404（1-24）', '17768', 'B0:8E:1A:33:04:04', 'B0:8E:1A:33:04:04', null, '35', '-28.059999465942383', '-17.56999969482422', '2019-07-08T13:32:52.545388+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (223, '166', '王思琦', '13221', 'B0:8E:1A:40:0D:75', 'B0:8E:1A:40:0D:75', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3423677+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (224, '180', '潘桂成', '12860', 'B0:8E:1A:40:0D:77', 'B0:8E:1A:40:0D:77', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3213656+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (225, '181', '伍树灼', '12098', 'B0:8E:1A:40:0D:76', 'B0:8E:1A:40:0D:76', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.2913626+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (226, '154', '渠立汉', '11522', 'B0:8E:1A:40:0A:A2', 'B0:8E:1A:40:0A:A2', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.2413576+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (227, '146', '资产4FCA(1-5)', '12670', 'B0:8E:1A:50:4F:CA', 'B0:8E:1A:50:4F:CA', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.3013636+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (228, '188', 'areoscout1', '20298', 'B0:8E:1A:41:03:D4', 'B0:8E:1A:41:03:D4', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.6664001+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (229, '192', '贡云炳Home', '27262', 'B0:8E:1A:41:0C:F4', 'B0:8E:1A:41:0C:F4', null, '1169', '12.029999732971191', '10.5', '2019-07-08T13:32:55.6516986+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (230, '233', 'model b BC', '31793', 'B0:8E:1A:36:01:BC', 'B0:8E:1A:36:01:BC', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:12.2383571+08:00', to_date('08-07-2019 13:33:12', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (231, '104', '赵慧', '14323', 'B0:8E:1A:40:0A:C2', 'B0:8E:1A:40:0A:C2', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.4103745+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (232, '195', 'ModelD360302', '29182', '36:03:02:00:00:00', '36:03:02:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.696403+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (233, '237', '雅马哈04', '28438', 'B0:8E:1A:40:03:2E', 'B0:8E:1A:40:03:2E', null, '33', '40.84', '39.54', '2019-07-09T09:34:00.6693389+08:00', to_date('09-07-2019 09:34:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (234, '248', '张大爷', '32282', 'B0:8E:1A:41:07:A0', 'B0:8E:1A:41:07:A0', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5174011+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (235, '229', '摔倒158A', '30279', 'B0:8E:1A:41:15:8A', 'B0:8E:1A:41:15:8A', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5284022+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (236, '241', '摔倒0794', '32279', 'B0:8E:1A:41:07:94', 'B0:8E:1A:41:07:94', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.516401+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:37', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (237, '221', '石福林', '11386', 'B0:8E:1A:40:0A:87', 'B0:8E:1A:40:0A:87', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5003994+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:37', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (238, '201', 'kkkkj', '11579', 'B0:8E:1A:40:0D:73', 'B0:8E:1A:40:0D:73', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5254019+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:37', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (239, '97', '武娟', '11355', 'B0:8E:1A:40:0A:71', 'B0:8E:1A:40:0A:71', '研发东北', '22', '24.86', '54.52', '2019-07-09T09:56:01.5234017+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (240, '246', '0C41', '32307', 'B0:8E:1A:41:0C:41', 'B0:8E:1A:41:0C:41', '101客厅', '33', '40.84', '39.54', '2019-07-09T09:56:01.5214015+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (241, '223', '测试223', '11545', 'B0:8E:1A:40:0E:DC', 'B0:8E:1A:40:0E:DC', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:54:54.4226923+08:00', to_date('09-07-2019 09:54:54', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (2, '29', '姜洪良', '11356', 'B0:8E:1A:40:0A:7C', 'B0:8E:1A:40:0A:7C', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1543489+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (3, '242', 'NB手环7405', '32534', '02:90:36:29:74:05', '02:90:36:29:74:05', null, '1400', '-3.119999885559082', '-2.390000104904175', '2019-07-08T13:33:14.9846317+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (4, '7', '董永平', '11381', 'B0:8E:1A:40:0F:90', '00010001', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1613496+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (5, '194', 'ModelD2000', '28326', 'B0:8E:1A:00:00:00', 'B0:8E:1A:00:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:59.5620896+08:00', to_date('08-07-2019 13:32:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (6, '240', '摔倒07CE', '32281', 'B0:8E:1A:41:07:CE', 'B0:8E:1A:41:07:CE', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:14.0465379+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (7, '248', '张大爷', '32282', 'B0:8E:1A:41:07:A0', 'B0:8E:1A:41:07:A0', null, '38', '88.77', '24.06', '2019-07-08T18:59:00.0889044+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (8, '229', '摔倒158A', '30279', 'B0:8E:1A:41:15:8A', 'B0:8E:1A:41:15:8A', null, '38', '88.77', '24.06', '2019-07-08T18:59:00.1019057+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (9, '231', '摔倒158B', '30277', 'B0:8E:1A:41:15:8B', 'B0:8E:1A:41:15:8B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:06.7028036+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (10, '241', '摔倒0794', '32279', 'B0:8E:1A:41:07:94', 'B0:8E:1A:41:07:94', null, '38', '88.77', '24.06', '2019-07-08T18:59:00.0919047+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (11, '221', '石福林', '11386', 'B0:8E:1A:40:0A:87', 'B0:8E:1A:40:0A:87', null, '33', '-40.84', '-39.54', '2019-07-08T17:58:26.4285841+08:00', to_date('08-07-2019 17:58:26', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (12, '96', '马桶监测505488', '11003', 'B0:8E:1A:50:54:88', 'B0:8E:1A:50:54:88', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1293464+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (13, '201', 'kkkkj', '11579', 'B0:8E:1A:40:0D:73', 'B0:8E:1A:40:0D:73', null, '38', '88.77', '24.06', '2019-07-08T18:59:00.1009056+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (14, '222', 'B', '26585', 'B0:8E:1A:40:06:B0', 'B0:8E:1A:40:06:B0', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:53.0994434+08:00', to_date('08-07-2019 13:32:53', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:17', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (15, '202', 'ModelD360301', '30348', '36:03:01:00:00:00', '36:03:01:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:06.9598293+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (16, '210', '64', '29197', 'B0:8E:1A:41:1B:64', 'B0:8E:1A:41:1B:64', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7594093+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (17, '113', '摔倒', '14663', 'B0:8E:1A:40:0F:1B', 'B0:8E:1A:40:0F:1B', null, '957', '85.87000274658203', '30.559999465942383', '2019-07-08T13:32:52.4363771+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (18, '125', '蓝牙信号测试', '12866', 'B0:8E:1A:40:04:C8', 'B0:8E:1A:40:04:C8', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3283663+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (19, '72', '吴家晟737', '11385', 'B0:8E:1A:40:0A:7D', 'B0:8E:1A:40:0A:7D', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.1763511+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (20, '97', '武娟', '11355', 'B0:8E:1A:40:0A:71', 'B0:8E:1A:40:0A:71', null, '38', '-88.77', '-24.06', '2019-07-08T18:01:55.7445136+08:00', to_date('08-07-2019 18:01:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (21, '145', 'Model-D 测试053A', '17485', 'B0:8E:1A:33:05:3A', 'B0:8E:1A:33:05:3A', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5313866+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (22, '170', 'Model-B test 0266', '21462', 'B0:8E:1A:36:02:66', 'B0:8E:1A:36:02:66', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6824017+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (23, '232', 'model b F2', '31795', 'B0:8E:1A:36:01:F2', 'B0:8E:1A:36:01:F2', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:12.2533586+08:00', to_date('08-07-2019 13:33:12', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (24, '193', '吴晟', '27066', 'B0:8E:1A:41:10:EE', 'B0:8E:1A:41:10:EE', null, '1138', '-42.7400016784668', '-7.190000057220459', '2019-07-08T13:32:54.9576292+08:00', to_date('08-07-2019 13:32:54', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (25, '197', 'ModelDV23602FC', '30140', '36:02:FC:00:00:00', '36:02:FC:00:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:06.2017535+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (26, '158', '测试卡片2', '19918', 'B0:8E:1A:40:21:92', 'B0:8E:1A:40:21:92', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.6063941+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (27, '246', '0C41', '32307', 'B0:8E:1A:41:0C:41', 'B0:8E:1A:41:0C:41', null, '33', '40.84', '39.54', '2019-07-08T18:59:00.0819037+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (28, '223', '测试223', '11545', 'B0:8E:1A:40:0E:DC', 'B0:8E:1A:40:0E:DC', null, '33', '40.84', '39.54', '2019-07-08T18:59:00.0959051+08:00', to_date('08-07-2019 18:59:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (29, '141', 'Model-D 测试051E', '17415', 'B0:8E:1A:33:05:1E', 'B0:8E:1A:33:05:1E', null, '38', '-85.39399719238281', '-21.90399932861328', '2019-07-08T13:32:52.5033838+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (30, '217', '董永平Model D', '28842', 'B0:8E:1A:36:02:FA', 'B0:8E:1A:36:02:FA', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:33:01.436277+08:00', to_date('08-07-2019 13:33:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (31, '148', 'Model_D 04F0（1-24）', '17775', 'B0:8E:1A:33:04:F0', 'B0:8E:1A:33:04:F0', null, '38', '-86.52385711669922', '-24.785438537597656', '2019-07-08T13:32:52.5803915+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (32, '178', '拉绳350035', '23471', 'B0:8E:1A:35:00:35', 'B0:8E:1A:35:00:35', null, '35', '-28.059999465942383', '-17.56999969482422', '2019-07-08T13:32:52.715405+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (33, '177', '拉绳350036', '23472', 'B0:8E:1A:35:00:36', 'B0:8E:1A:35:00:36', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7224057+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (34, '133', '资产4FE8(9-26)', '11561', 'B0:8E:1A:50:4F:E8', 'B0:8E:1A:50:4F:E8', null, '38', '88.77', '24.06', '2019-07-08T18:57:19.9988964+08:00', to_date('08-07-2019 18:57:19', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (35, '168', 'Model-B test 01D5', '21608', 'B0:8E:1A:36:01:D5', 'B0:8E:1A:36:01:D5', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7004035+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (36, '174', '李全宝', '17156', 'B0:8E:1A:40:1A:B5', 'B0:8E:1A:40:1A:B5', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4863821+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (37, '239', 'NB演示', '32490', '02:90:36:42:64:83', '02:90:36:42:64:83', null, '1259', '-13.6899995803833', '-6.099999904632568', '2019-07-08T13:33:14.817615+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (38, '216', 'wifi蓝牙标签0333', '30655', 'B0:8E:1A:36:03:33', 'B0:8E:1A:36:03:33', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:33:08.0699403+08:00', to_date('08-07-2019 13:33:08', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (39, '244', 'dyp10002', '30398', 'B0:8E:1A:36:03:30', '00010002', null, '38', '88.77', '24.06', '2019-07-08T18:58:59.1028058+08:00', to_date('08-07-2019 18:58:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (40, '64', '高燕', '11500', 'B0:8E:1A:40:0A:F2', 'B0:8E:1A:40:0A:F2', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.2193554+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (41, '137', '黄-Model-D 0019', '16375', 'B0:8E:1A:40:0A:F7', 'B0:8E:1A:40:0A:F7', null, '38', '88.77', '24.06', '2019-07-08T18:58:56.0965052+08:00', to_date('08-07-2019 18:58:56', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (42, '167', '蔡曦铭', '11406', 'B0:8E:1A:40:0E:FF', 'B0:8E:1A:40:0E:FF', null, '38', '-88.77', '-24.06', '2019-07-08T18:03:02.0711456+08:00', to_date('08-07-2019 18:03:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (43, '247', '1315', '11320', 'B0:8E:1A:50:13:15', 'B0:8E:1A:50:13:15', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.135347+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (44, '179', '梁琰佳', '16448', 'B0:8E:1A:40:0D:01', 'B0:8E:1A:40:0D:01', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.4763811+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (45, '31', '陆萍萍', '11511', 'B0:8E:1A:40:0F:95', 'B0:8E:1A:40:0F:95', null, '38', '-88.77', '-24.06', '2019-07-08T17:56:54.2993721+08:00', to_date('08-07-2019 17:56:54', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (46, '103', '黄东升', '29949', 'B0:8E:1A:41:09:08', 'B0:8E:1A:41:09:08', null, '38', '-88.77', '-24.06', '2019-07-08T17:58:43.559297+08:00', to_date('08-07-2019 17:58:43', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (47, '131', 'ESP马桶检测000B', '16273', 'B0:8E:1A:40:00:0B', 'B0:8E:1A:40:00:0B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4463781+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (48, '187', '1D60', '27261', 'B0:8E:1A:40:1D:60', 'B0:8E:1A:40:1D:60', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:55.645698+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (49, '200', '9b', '26520', 'B0:8E:1A:41:11:9B', 'B0:8E:1A:41:11:9B', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.7584093+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (50, '110', '摔倒0000', '13608', 'B0:8E:1A:40:00:00', 'B0:8E:1A:40:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.3493684+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (51, '111', '摔倒1126', '14332', 'B0:8E:1A:40:11:26', 'B0:8E:1A:40:11:26', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4183753+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (52, '63', '时林虎', '11516', 'B0:8E:1A:40:0A:95', 'B0:8E:1A:40:0A:95', null, '33', '-40.84', '-39.54', '2019-07-08T17:35:37.10367+08:00', to_date('08-07-2019 17:35:37', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (53, '155', 'model_b', '20121', 'B0:8E:1A:36:11:11', 'B0:8E:1A:36:11:11', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.615395+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -commit; -prompt 100 records committed... -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (54, '9', '杨亦铭', '11492', 'B0:8E:1A:40:0A:BB', 'B0:8E:1A:40:0A:BB', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.2113546+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (55, '150', 'Model_D 0434（1-24）', '17773', 'B0:8E:1A:33:04:34', 'B0:8E:1A:33:04:34', null, '1139', '-45.43000030517578', '-5.789999961853027', '2019-07-08T13:32:52.5633898+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (56, '245', '手环01', '32613', 'B0:8E:5A:00:00:01', 'B0:8E:5A:00:00:01', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:15.2986631+08:00', to_date('08-07-2019 13:33:15', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (57, '196', 'ModeD3602FB', '29464', '36:02:FB:00:00:00', '36:02:FB:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:03.7725106+08:00', to_date('08-07-2019 13:33:03', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (58, '45', '贡云炳', '11384', 'B0:8E:1A:40:0A:6F', 'B0:8E:1A:40:0A:6F', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.1673502+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (59, '224', '1589', '30268', 'B0:8E:1A:41:15:89', 'B0:8E:1A:41:15:89', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:06.6607994+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (60, '235', '雅马哈02', '30400', 'B0:8E:1A:36:03:10', 'B0:8E:1A:36:03:10', null, '1235', '-112.12999725341797', '-200.58999633789062', '2019-07-08T13:33:07.1538487+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (61, '84', '周乾', '11573', 'B0:8E:1A:40:0A:D4', 'B0:8E:1A:40:0A:D4', null, '33', '40.84', '39.54', '2019-07-08T18:59:01.0910046+08:00', to_date('08-07-2019 18:59:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (62, '189', 'areoscout2', '20775', 'B0:8E:1A:41:01:D2', 'B0:8E:1A:41:01:D2', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6744009+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (63, '159', '测试卡片3', '19824', 'B0:8E:1A:40:22:2E', 'B0:8E:1A:40:22:2E', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.5933928+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (64, '207', '52', '29199', 'B0:8E:1A:41:1B:52', 'B0:8E:1A:41:1B:52', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7704104+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (65, '206', '56', '29218', 'B0:8E:1A:41:1B:56', 'B0:8E:1A:41:1B:56', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8454179+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (66, '208', '5A', '29186', 'B0:8E:1A:41:1B:5A', 'B0:8E:1A:41:1B:5A', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7124046+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (67, '165', '李立峰', '13077', 'B0:8E:1A:40:0D:84', 'B0:8E:1A:40:0D:84', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3343669+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (68, '106', 'test0980', '13792', 'B0:8E:1A:90:09:80', 'B0:8E:1A:90:09:80', null, '0', '1.0', '1.0', '2019-07-08T13:32:52.355369+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (69, '163', 'model_b004', '20162', 'B0:8E:1A:36:00:04', 'B0:8E:1A:36:00:04', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6593994+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (70, '164', 'Model-B 0003', '20161', 'B0:8E:1A:36:00:03', 'B0:8E:1A:36:00:03', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6473982+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (71, '160', 'ModelB02', '20160', 'B0:8E:1A:36:00:02', 'B0:8E:1A:36:00:02', null, '946', '-85.97000122070312', '-11.779999732971191', '2019-07-08T13:32:52.6403975+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (72, '162', 'ModelB01', '20127', 'B0:8E:1A:36:00:01', 'B0:8E:1A:36:00:01', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6233958+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (73, '161', 'ModelB00', '20159', 'B0:8E:1A:36:00:00', 'B0:8E:1A:36:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.6313966+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (74, '211', '3D', '29432', 'B0:8E:1A:41:1B:3D', 'B0:8E:1A:41:1B:3D', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:03.646498+08:00', to_date('08-07-2019 13:33:03', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (75, '107', 'test3C3B', '11548', 'B0:8E:1A:50:3C:3B', 'B0:8E:1A:50:3C:3B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.255359+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (76, '171', '拉绳test 0006', '22652', 'B0:8E:1A:34:00:06', 'B0:8E:1A:34:00:06', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7074042+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (77, '149', 'Model_D 0566（1-24）', '17774', 'B0:8E:1A:33:05:66', 'B0:8E:1A:33:05:66', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5723907+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (78, '112', '谢晓威', '14449', 'B0:8E:1A:40:0D:B3', 'B0:8E:1A:40:0D:B3', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4273762+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (79, '186', '0D68', '27260', 'B0:8E:1A:41:0D:68', 'B0:8E:1A:41:0D:68', null, '1160', '-3.7899999618530273', '-3.869999885559082', '2019-07-08T13:32:55.6406975+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (80, '214', '蓝牙标签0129-360351', '30420', 'B0:8E:1A:36:03:51', 'B0:8E:1A:36:03:51', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:07.2298563+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (81, '151', 'Model_D 011A（1-24）', '17745', 'B0:8E:1A:33:01:1A', 'B0:8E:1A:33:01:1A', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5383873+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (82, '243', '楚云飞', '27776', 'B0:8E:1A:41:10:80', 'B0:8E:1A:41:10:80', null, '33', '40.84', '39.54', '2019-07-08T18:59:01.0960051+08:00', to_date('08-07-2019 18:59:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (83, '238', '3568', '32059', '02:90:30:35:35:68', '02:90:30:35:35:68', null, '1242', '-91.06999969482422', '-37.7400016784668', '2019-07-08T13:33:13.2344567+08:00', to_date('08-07-2019 13:33:13', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (84, '144', 'Model-D 测试0548', '17429', 'B0:8E:1A:33:05:48', 'B0:8E:1A:33:05:48', null, '38', '-85.63287353515625', '-23.543903350830078', '2019-07-08T13:32:52.5123847+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (85, '142', 'Model-D 测试0544', '17399', 'B0:8E:1A:33:05:44', 'B0:8E:1A:33:05:44', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.4923827+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (86, '153', 'NEWAPI4796', '11449', 'B0:8E:1A:50:47:96', 'B0:8E:1A:50:47:96', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.2043539+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (87, '225', '0019', '14130', 'B0:8E:1A:40:00:19', 'B0:8E:1A:40:00:19', null, '0', '-1.0', '-1.0', '2019-07-08T13:32:52.3843719+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (88, '136', '测试0013', '16423', 'B0:8E:1A:40:00:13', 'B0:8E:1A:40:00:13', null, '33', '-44.05439376831055', '-38.5018424987793', '2019-07-08T13:32:52.4693804+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (89, '135', '0015蓝牙标签(1103 17:00)', '14145', 'B0:8E:1A:40:00:15', 'B0:8E:1A:40:00:15', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.3923727+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (90, '138', '董-Model-D 0017', '14096', 'B0:8E:1A:40:00:17', 'B0:8E:1A:40:00:17', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:32:52.36537+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (91, '139', '杨-Model-D 0016', '14100', 'B0:8E:1A:40:00:16', 'B0:8E:1A:40:00:16', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.3743709+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (92, '169', 'Model-B test 0295', '21494', 'B0:8E:1A:36:02:95', 'B0:8E:1A:36:02:95', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6904025+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (93, '126', '蓝牙信号测试1', '12844', 'B0:8E:1A:40:0E:C8', 'B0:8E:1A:40:0E:C8', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.3143649+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (94, '46', '龚丽珍', '11408', 'B0:8E:1A:40:0A:EB', 'B0:8E:1A:40:0A:EB', null, '38', '-88.77', '-24.06', '2019-07-08T17:57:02.2361657+08:00', to_date('08-07-2019 17:57:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (95, '236', '雅马哈03', '30403', 'B0:8E:1A:36:03:09', 'B0:8E:1A:36:03:09', null, '1237', '-205.69000244140625', '-202.38999938964844', '2019-07-08T13:33:07.1658499+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (96, '226', '雅马哈', '30389', 'B0:8E:1A:36:03:0C', 'B0:8E:1A:36:03:0C', null, '1230', '-73.38999938964844', '-53.91999816894531', '2019-07-08T13:33:07.1118445+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (97, '143', 'Model-D 测试05AC', '17457', 'B0:8E:1A:33:05:AC', 'B0:8E:1A:33:05:AC', null, '868', '-85.16999816894531', '-26.760000228881836', '2019-07-08T13:32:52.5203855+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (98, '203', '48', '29189', 'B0:8E:1A:41:1B:48', 'B0:8E:1A:41:1B:48', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7244058+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (99, '205', '44', '29190', 'B0:8E:1A:41:1B:44', 'B0:8E:1A:41:1B:44', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7304064+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (100, '212', '4A', '29213', 'B0:8E:1A:41:1B:4A', 'B0:8E:1A:41:1B:4A', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8214155+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (101, '209', '4B', '29198', 'B0:8E:1A:41:1B:4B', 'B0:8E:1A:41:1B:4B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7654099+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (102, '204', '4E', '29217', 'B0:8E:1A:41:1B:4E', 'B0:8E:1A:41:1B:4E', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8394173+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (103, '234', '雅马哈01', '30498', 'B0:8E:1A:36:03:23', 'B0:8E:1A:36:03:23', null, '0', '0.0', '0.0', '2019-07-08T13:33:07.5108844+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (104, '220', '蔡曦铭Model D', '30382', 'B0:8E:1A:36:03:2F', 'B0:8E:1A:36:03:2F', null, '1237', '205.69000244140625', '202.38999938964844', '2019-07-08T13:33:07.0858419+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (105, '152', 'Model_D 0406（1-24）', '17772', 'B0:8E:1A:33:04:06', 'B0:8E:1A:33:04:06', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.555389+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (106, '147', 'Model_D 0404（1-24）', '17768', 'B0:8E:1A:33:04:04', 'B0:8E:1A:33:04:04', null, '35', '-28.059999465942383', '-17.56999969482422', '2019-07-08T13:32:52.545388+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (107, '166', '王思琦', '13221', 'B0:8E:1A:40:0D:75', 'B0:8E:1A:40:0D:75', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3423677+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (108, '180', '潘桂成', '12860', 'B0:8E:1A:40:0D:77', 'B0:8E:1A:40:0D:77', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3213656+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (109, '181', '伍树灼', '12098', 'B0:8E:1A:40:0D:76', 'B0:8E:1A:40:0D:76', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.2913626+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (110, '154', '渠立汉', '11522', 'B0:8E:1A:40:0A:A2', 'B0:8E:1A:40:0A:A2', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.2413576+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (111, '146', '资产4FCA(1-5)', '12670', 'B0:8E:1A:50:4F:CA', 'B0:8E:1A:50:4F:CA', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.3013636+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (112, '188', 'areoscout1', '20298', 'B0:8E:1A:41:03:D4', 'B0:8E:1A:41:03:D4', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.6664001+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (113, '192', '贡云炳Home', '27262', 'B0:8E:1A:41:0C:F4', 'B0:8E:1A:41:0C:F4', null, '1169', '12.029999732971191', '10.5', '2019-07-08T13:32:55.6516986+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (114, '233', 'model b BC', '31793', 'B0:8E:1A:36:01:BC', 'B0:8E:1A:36:01:BC', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:12.2383571+08:00', to_date('08-07-2019 13:33:12', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (115, '104', '赵慧', '14323', 'B0:8E:1A:40:0A:C2', 'B0:8E:1A:40:0A:C2', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.4103745+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (116, '195', 'ModelD360302', '29182', '36:03:02:00:00:00', '36:03:02:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.696403+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (117, '237', '雅马哈04', '28438', 'B0:8E:1A:40:03:2E', 'B0:8E:1A:40:03:2E', null, '38', '88.77', '24.06', '2019-07-08T18:59:01.0840039+08:00', to_date('08-07-2019 18:59:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('05-07-2019 11:12:18', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (118, '29', '姜洪良', '11356', 'B0:8E:1A:40:0A:7C', 'B0:8E:1A:40:0A:7C', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1543489+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (119, '242', 'NB手环7405', '32534', '02:90:36:29:74:05', '02:90:36:29:74:05', null, '1400', '-3.119999885559082', '-2.390000104904175', '2019-07-08T13:33:14.9846317+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (120, '7', '董永平', '11381', 'B0:8E:1A:40:0F:90', '00010001', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1613496+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (121, '194', 'ModelD2000', '28326', 'B0:8E:1A:00:00:00', 'B0:8E:1A:00:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:59.5620896+08:00', to_date('08-07-2019 13:32:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (122, '240', '摔倒07CE', '32281', 'B0:8E:1A:41:07:CE', 'B0:8E:1A:41:07:CE', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:14.0465379+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (123, '248', '张大爷', '32282', 'B0:8E:1A:41:07:A0', 'B0:8E:1A:41:07:A0', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6932413+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (124, '229', '摔倒158A', '30279', 'B0:8E:1A:41:15:8A', 'B0:8E:1A:41:15:8A', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6952415+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (125, '231', '摔倒158B', '30277', 'B0:8E:1A:41:15:8B', 'B0:8E:1A:41:15:8B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:06.7028036+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (126, '241', '摔倒0794', '32279', 'B0:8E:1A:41:07:94', 'B0:8E:1A:41:07:94', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6962416+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (127, '221', '石福林', '11386', 'B0:8E:1A:40:0A:87', 'B0:8E:1A:40:0A:87', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6822402+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (128, '96', '马桶监测505488', '11003', 'B0:8E:1A:50:54:88', 'B0:8E:1A:50:54:88', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.1293464+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (129, '201', 'kkkkj', '11579', 'B0:8E:1A:40:0D:73', 'B0:8E:1A:40:0D:73', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6952415+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (130, '222', 'B', '26585', 'B0:8E:1A:40:06:B0', 'B0:8E:1A:40:06:B0', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:53.0994434+08:00', to_date('08-07-2019 13:32:53', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (131, '202', 'ModelD360301', '30348', '36:03:01:00:00:00', '36:03:01:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:06.9598293+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (132, '210', '64', '29197', 'B0:8E:1A:41:1B:64', 'B0:8E:1A:41:1B:64', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7594093+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (133, '113', '摔倒', '14663', 'B0:8E:1A:40:0F:1B', 'B0:8E:1A:40:0F:1B', null, '957', '85.87000274658203', '30.559999465942383', '2019-07-08T13:32:52.4363771+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (134, '125', '蓝牙信号测试', '12866', 'B0:8E:1A:40:04:C8', 'B0:8E:1A:40:04:C8', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3283663+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (135, '72', '吴家晟737', '11385', 'B0:8E:1A:40:0A:7D', 'B0:8E:1A:40:0A:7D', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.1763511+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (136, '97', '武娟', '11355', 'B0:8E:1A:40:0A:71', 'B0:8E:1A:40:0A:71', null, '22', '24.86', '54.52', '2019-07-09T09:33:59.690241+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (137, '145', 'Model-D 测试053A', '17485', 'B0:8E:1A:33:05:3A', 'B0:8E:1A:33:05:3A', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5313866+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (138, '170', 'Model-B test 0266', '21462', 'B0:8E:1A:36:02:66', 'B0:8E:1A:36:02:66', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6824017+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (139, '232', 'model b F2', '31795', 'B0:8E:1A:36:01:F2', 'B0:8E:1A:36:01:F2', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:12.2533586+08:00', to_date('08-07-2019 13:33:12', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (140, '193', '吴晟', '27066', 'B0:8E:1A:41:10:EE', 'B0:8E:1A:41:10:EE', null, '1138', '-42.7400016784668', '-7.190000057220459', '2019-07-08T13:32:54.9576292+08:00', to_date('08-07-2019 13:32:54', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (141, '197', 'ModelDV23602FC', '30140', '36:02:FC:00:00:00', '36:02:FC:00:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:06.2017535+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (142, '158', '测试卡片2', '19918', 'B0:8E:1A:40:21:92', 'B0:8E:1A:40:21:92', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.6063941+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (143, '246', '0C41', '32307', 'B0:8E:1A:41:0C:41', 'B0:8E:1A:41:0C:41', null, '33', '40.84', '39.54', '2019-07-09T09:33:59.6942414+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (144, '223', '测试223', '11545', 'B0:8E:1A:40:0E:DC', 'B0:8E:1A:40:0E:DC', null, '38', '88.77', '24.06', '2019-07-09T09:33:58.6821402+08:00', to_date('09-07-2019 09:33:58', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (145, '141', 'Model-D 测试051E', '17415', 'B0:8E:1A:33:05:1E', 'B0:8E:1A:33:05:1E', null, '38', '-85.39399719238281', '-21.90399932861328', '2019-07-08T13:32:52.5033838+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (146, '217', '董永平Model D', '28842', 'B0:8E:1A:36:02:FA', 'B0:8E:1A:36:02:FA', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:33:01.436277+08:00', to_date('08-07-2019 13:33:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (147, '148', 'Model_D 04F0（1-24）', '17775', 'B0:8E:1A:33:04:F0', 'B0:8E:1A:33:04:F0', null, '38', '-86.52385711669922', '-24.785438537597656', '2019-07-08T13:32:52.5803915+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (148, '178', '拉绳350035', '23471', 'B0:8E:1A:35:00:35', 'B0:8E:1A:35:00:35', null, '35', '-28.059999465942383', '-17.56999969482422', '2019-07-08T13:32:52.715405+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (149, '177', '拉绳350036', '23472', 'B0:8E:1A:35:00:36', 'B0:8E:1A:35:00:36', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7224057+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (150, '133', '资产4FE8(9-26)', '11561', 'B0:8E:1A:50:4F:E8', 'B0:8E:1A:50:4F:E8', null, '38', '-88.77', '-24.06', '2019-07-09T09:31:38.7141448+08:00', to_date('09-07-2019 09:31:38', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (151, '168', 'Model-B test 01D5', '21608', 'B0:8E:1A:36:01:D5', 'B0:8E:1A:36:01:D5', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7004035+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (152, '174', '李全宝', '17156', 'B0:8E:1A:40:1A:B5', 'B0:8E:1A:40:1A:B5', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4863821+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (153, '239', 'NB演示', '32490', '02:90:36:42:64:83', '02:90:36:42:64:83', null, '1259', '-13.6899995803833', '-6.099999904632568', '2019-07-08T13:33:14.817615+08:00', to_date('08-07-2019 13:33:14', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -commit; -prompt 200 records committed... -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (154, '216', 'wifi蓝牙标签0333', '30655', 'B0:8E:1A:36:03:33', 'B0:8E:1A:36:03:33', null, '38', '88.7699966430664', '24.059999465942383', '2019-07-08T13:33:08.0699403+08:00', to_date('08-07-2019 13:33:08', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (155, '244', 'dyp10002', '30398', 'B0:8E:1A:36:03:30', '00010002', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6892409+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (156, '64', '高燕', '11500', 'B0:8E:1A:40:0A:F2', 'B0:8E:1A:40:0A:F2', null, '24', '54.12', '54.62', '2019-07-09T09:33:59.6892409+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (157, '137', '黄-Model-D 0019', '16375', 'B0:8E:1A:40:0A:F7', 'B0:8E:1A:40:0A:F7', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6912411+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (158, '167', '蔡曦铭', '11406', 'B0:8E:1A:40:0E:FF', 'B0:8E:1A:40:0E:FF', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6922412+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (159, '247', '1315', '11320', 'B0:8E:1A:50:13:15', 'B0:8E:1A:50:13:15', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.135347+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (160, '179', '梁琰佳', '16448', 'B0:8E:1A:40:0D:01', 'B0:8E:1A:40:0D:01', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.4763811+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (161, '31', '陆萍萍', '11511', 'B0:8E:1A:40:0F:95', 'B0:8E:1A:40:0F:95', null, '21', '27.66', '35.05', '2019-07-09T09:33:59.6812401+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (162, '103', '黄东升', '29949', 'B0:8E:1A:41:09:08', 'B0:8E:1A:41:09:08', null, '38', '88.77', '24.06', '2019-07-09T09:33:59.6712391+08:00', to_date('09-07-2019 09:33:59', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:34', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (163, '131', 'ESP马桶检测000B', '16273', 'B0:8E:1A:40:00:0B', 'B0:8E:1A:40:00:0B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4463781+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (164, '187', '1D60', '27261', 'B0:8E:1A:40:1D:60', 'B0:8E:1A:40:1D:60', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:55.645698+08:00', to_date('08-07-2019 13:32:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (165, '200', '9b', '26520', 'B0:8E:1A:41:11:9B', 'B0:8E:1A:41:11:9B', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.7584093+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (166, '110', '摔倒0000', '13608', 'B0:8E:1A:40:00:00', 'B0:8E:1A:40:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.3493684+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (167, '111', '摔倒1126', '14332', 'B0:8E:1A:40:11:26', 'B0:8E:1A:40:11:26', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.4183753+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (168, '63', '时林虎', '11516', 'B0:8E:1A:40:0A:95', 'B0:8E:1A:40:0A:95', null, '38', '88.77', '24.06', '2019-07-09T09:33:56.6719392+08:00', to_date('09-07-2019 09:33:56', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (169, '155', 'model_b', '20121', 'B0:8E:1A:36:11:11', 'B0:8E:1A:36:11:11', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.615395+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (170, '9', '杨亦铭', '11492', 'B0:8E:1A:40:0A:BB', 'B0:8E:1A:40:0A:BB', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.2113546+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (171, '150', 'Model_D 0434（1-24）', '17773', 'B0:8E:1A:33:04:34', 'B0:8E:1A:33:04:34', null, '1139', '-45.43000030517578', '-5.789999961853027', '2019-07-08T13:32:52.5633898+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (172, '245', '手环01', '32613', 'B0:8E:5A:00:00:01', 'B0:8E:5A:00:00:01', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:15.2986631+08:00', to_date('08-07-2019 13:33:15', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (173, '196', 'ModeD3602FB', '29464', '36:02:FB:00:00:00', '36:02:FB:00:00:00', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:03.7725106+08:00', to_date('08-07-2019 13:33:03', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (174, '45', '贡云炳', '11384', 'B0:8E:1A:40:0A:6F', 'B0:8E:1A:40:0A:6F', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.1673502+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (175, '224', '1589', '30268', 'B0:8E:1A:41:15:89', 'B0:8E:1A:41:15:89', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:33:06.6607994+08:00', to_date('08-07-2019 13:33:06', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (176, '235', '雅马哈02', '30400', 'B0:8E:1A:36:03:10', 'B0:8E:1A:36:03:10', null, '1235', '-112.12999725341797', '-200.58999633789062', '2019-07-08T13:33:07.1538487+08:00', to_date('08-07-2019 13:33:07', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (177, '84', '周乾', '11573', 'B0:8E:1A:40:0A:D4', 'B0:8E:1A:40:0A:D4', null, '33', '40.84', '39.54', '2019-07-09T09:34:00.6883408+08:00', to_date('09-07-2019 09:34:00', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (178, '189', 'areoscout2', '20775', 'B0:8E:1A:41:01:D2', 'B0:8E:1A:41:01:D2', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6744009+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (179, '159', '测试卡片3', '19824', 'B0:8E:1A:40:22:2E', 'B0:8E:1A:40:22:2E', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.5933928+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (180, '207', '52', '29199', 'B0:8E:1A:41:1B:52', 'B0:8E:1A:41:1B:52', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7704104+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (181, '206', '56', '29218', 'B0:8E:1A:41:1B:56', 'B0:8E:1A:41:1B:56', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.8454179+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (182, '208', '5A', '29186', 'B0:8E:1A:41:1B:5A', 'B0:8E:1A:41:1B:5A', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:02.7124046+08:00', to_date('08-07-2019 13:33:02', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (183, '165', '李立峰', '13077', 'B0:8E:1A:40:0D:84', 'B0:8E:1A:40:0D:84', null, '0', '0.0', '0.0', '2019-07-08T13:32:52.3343669+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (184, '106', 'test0980', '13792', 'B0:8E:1A:90:09:80', 'B0:8E:1A:90:09:80', null, '0', '1.0', '1.0', '2019-07-08T13:32:52.355369+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (185, '163', 'model_b004', '20162', 'B0:8E:1A:36:00:04', 'B0:8E:1A:36:00:04', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6593994+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (186, '164', 'Model-B 0003', '20161', 'B0:8E:1A:36:00:03', 'B0:8E:1A:36:00:03', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6473982+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (187, '160', 'ModelB02', '20160', 'B0:8E:1A:36:00:02', 'B0:8E:1A:36:00:02', null, '946', '-85.97000122070312', '-11.779999732971191', '2019-07-08T13:32:52.6403975+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (188, '162', 'ModelB01', '20127', 'B0:8E:1A:36:00:01', 'B0:8E:1A:36:00:01', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.6233958+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (189, '161', 'ModelB00', '20159', 'B0:8E:1A:36:00:00', 'B0:8E:1A:36:00:00', null, '33', '-40.84000015258789', '-39.540000915527344', '2019-07-08T13:32:52.6313966+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (190, '211', '3D', '29432', 'B0:8E:1A:41:1B:3D', 'B0:8E:1A:41:1B:3D', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:33:03.646498+08:00', to_date('08-07-2019 13:33:03', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (191, '107', 'test3C3B', '11548', 'B0:8E:1A:50:3C:3B', 'B0:8E:1A:50:3C:3B', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.255359+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (192, '171', '拉绳test 0006', '22652', 'B0:8E:1A:34:00:06', 'B0:8E:1A:34:00:06', null, '38', '-88.7699966430664', '-24.059999465942383', '2019-07-08T13:32:52.7074042+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (193, '149', 'Model_D 0566（1-24）', '17774', 'B0:8E:1A:33:05:66', 'B0:8E:1A:33:05:66', null, '867', '-79.18000030517578', '-26.959999084472656', '2019-07-08T13:32:52.5723907+08:00', to_date('08-07-2019 13:32:52', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:33:35', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (242, '133', '资产4FE8(9-26)', '11561', 'B0:8E:1A:50:4F:E8', 'B0:8E:1A:50:4F:E8', '101洗漱间', '38', '-88.77', '-24.06', '2019-07-09T09:51:55.4978016+08:00', to_date('09-07-2019 09:51:55', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (243, '244', 'dyp10002', '30398', 'B0:8E:1A:36:03:30', '00010002', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5224016+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (244, '64', '高燕', '11500', 'B0:8E:1A:40:0A:F2', 'B0:8E:1A:40:0A:F2', '研发西北', '24', '54.12', '54.62', '2019-07-09T09:56:01.5234017+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (245, '137', '黄-Model-D 0019', '16375', 'B0:8E:1A:40:0A:F7', 'B0:8E:1A:40:0A:F7', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5234017+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (246, '167', '蔡曦铭', '11406', 'B0:8E:1A:40:0E:FF', 'B0:8E:1A:40:0E:FF', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5244018+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (247, '31', '陆萍萍', '11511', 'B0:8E:1A:40:0F:95', 'B0:8E:1A:40:0F:95', '101客厅', '33', '40.84', '39.54', '2019-07-09T09:56:01.5094003+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (248, '103', '黄东升', '29949', 'B0:8E:1A:41:09:08', 'B0:8E:1A:41:09:08', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5064+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (249, '63', '时林虎', '11516', 'B0:8E:1A:40:0A:95', 'B0:8E:1A:40:0A:95', '101客厅', '33', '40.84', '39.54', '2019-07-09T09:56:01.5064+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (250, '84', '周乾', '11573', 'B0:8E:1A:40:0A:D4', 'B0:8E:1A:40:0A:D4', '101客厅', '33', '40.84', '39.54', '2019-07-09T09:56:01.5174011+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (251, '243', '楚云飞', '27776', 'B0:8E:1A:41:10:80', 'B0:8E:1A:41:10:80', '101客厅', '33', '40.84', '39.54', '2019-07-09T09:56:01.5224016+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (252, '46', '龚丽珍', '11408', 'B0:8E:1A:40:0A:EB', 'B0:8E:1A:40:0A:EB', '101卧室', '21', '27.66', '35.05', '2019-07-09T09:56:01.5244018+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -insert into PG_TAGPOSITION (id, hostid, hostname, tagid, tagmac, tagmacname, coordinatesname, coordinate, x, y, positionupdatetime, parsedtime, querytime) -values (253, '237', '雅马哈04', '28438', 'B0:8E:1A:40:03:2E', 'B0:8E:1A:40:03:2E', '101洗漱间', '38', '88.77', '24.06', '2019-07-09T09:56:01.5074001+08:00', to_date('09-07-2019 09:56:01', 'dd-mm-yyyy hh24:mi:ss'), to_date('07-07-2019 01:55:38', 'dd-mm-yyyy hh24:mi:ss')); -commit; -prompt 252 records loaded -prompt Enabling triggers for PG_TAGPOSITION... -alter table PG_TAGPOSITION enable all triggers; - -create or replace view tagpositionview as -select hostId "hostId",hostName "hostName" ,X ,Y ,tagMac "tagMac", -positionUpdateTime "positionUpdateTime" , -coordinatesName "coordinatesName" - from pg_tagposition where id in ( -select max(id) from pg_tagposition ---where querytime between sysdate-1/12 and sysdate -group by hostid -) -; - -set feedback on -set define on -prompt Done