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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
index 4f14abf..c3f69f4 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -1,8 +1,14 @@
 package com.casic.PgInterface.overtimeInPG.web;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagMac;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto;
 import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager;
+import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
+import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,6 +25,10 @@
 private PGInOutRecManager pgInOutRecManager;
 @Resource
 private PGTagPositionManager pgTagPositionManager;
+@Resource
+private PgInPgPersonManager pgInPgPersonManager;
+@Resource
+private PGTagMacManager pgTagMacManager;
 
     @RequestMapping("query")
     @ResponseBody
@@ -31,9 +41,15 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String , Object> getRecentPosition()
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
     {
-        return pgTagPositionManager.getRecentPosition();
+        Map<String, Object> resultMap = new HashMap<>();
+        PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
+        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode());
+        PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac()));
+        resultMap.put("msg","success");
+        resultMap.put("result",new PGTagPositionDto(pgTagPosition));
+        return resultMap;
     }
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
index 4f14abf..c3f69f4 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -1,8 +1,14 @@
 package com.casic.PgInterface.overtimeInPG.web;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagMac;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto;
 import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager;
+import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
+import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,6 +25,10 @@
 private PGInOutRecManager pgInOutRecManager;
 @Resource
 private PGTagPositionManager pgTagPositionManager;
+@Resource
+private PgInPgPersonManager pgInPgPersonManager;
+@Resource
+private PGTagMacManager pgTagMacManager;
 
     @RequestMapping("query")
     @ResponseBody
@@ -31,9 +41,15 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String , Object> getRecentPosition()
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
     {
-        return pgTagPositionManager.getRecentPosition();
+        Map<String, Object> resultMap = new HashMap<>();
+        PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
+        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode());
+        PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac()));
+        resultMap.put("msg","success");
+        resultMap.put("result",new PGTagPositionDto(pgTagPosition));
+        return resultMap;
     }
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml
index 0378dfb..b728ef5 100644
--- a/src/main/resources/spring/taskConfig-applicationContext.xml
+++ b/src/main/resources/spring/taskConfig-applicationContext.xml
@@ -15,6 +15,7 @@
 
     <task:scheduled-tasks>
         <task:scheduled ref="PGTask" method="overtimeInPG" cron="0 0/20 * * * ?" />
+        <task:scheduled ref="PGTask" method="getMacPosition" cron="0 0/10 * * * ?" />
         <task:scheduled ref="PGTask" method="getAllMac" cron="0 0 0 0 1/1 ? "/>
     </task:scheduled-tasks>
 

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
index 4f14abf..c3f69f4 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -1,8 +1,14 @@
 package com.casic.PgInterface.overtimeInPG.web;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagMac;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto;
 import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager;
+import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
+import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,6 +25,10 @@
 private PGInOutRecManager pgInOutRecManager;
 @Resource
 private PGTagPositionManager pgTagPositionManager;
+@Resource
+private PgInPgPersonManager pgInPgPersonManager;
+@Resource
+private PGTagMacManager pgTagMacManager;
 
     @RequestMapping("query")
     @ResponseBody
@@ -31,9 +41,15 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String , Object> getRecentPosition()
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
     {
-        return pgTagPositionManager.getRecentPosition();
+        Map<String, Object> resultMap = new HashMap<>();
+        PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
+        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode());
+        PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac()));
+        resultMap.put("msg","success");
+        resultMap.put("result",new PGTagPositionDto(pgTagPosition));
+        return resultMap;
     }
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml
index 0378dfb..b728ef5 100644
--- a/src/main/resources/spring/taskConfig-applicationContext.xml
+++ b/src/main/resources/spring/taskConfig-applicationContext.xml
@@ -15,6 +15,7 @@
 
     <task:scheduled-tasks>
         <task:scheduled ref="PGTask" method="overtimeInPG" cron="0 0/20 * * * ?" />
+        <task:scheduled ref="PGTask" method="getMacPosition" cron="0 0/10 * * * ?" />
         <task:scheduled ref="PGTask" method="getAllMac" cron="0 0 0 0 1/1 ? "/>
     </task:scheduled-tasks>
 
diff --git a/tagMac.sql b/tagMac.sql
new file mode 100644
index 0000000..d24c521
--- /dev/null
+++ b/tagMac.sql
@@ -0,0 +1,287 @@
+???prompt PL/SQL Developer Export Tables for user ZHYQ@XE
+prompt Created by LenovoWork on 2019��8��20��
+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/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
index 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
index 4f14abf..c3f69f4 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -1,8 +1,14 @@
 package com.casic.PgInterface.overtimeInPG.web;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagMac;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto;
 import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager;
+import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
+import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,6 +25,10 @@
 private PGInOutRecManager pgInOutRecManager;
 @Resource
 private PGTagPositionManager pgTagPositionManager;
+@Resource
+private PgInPgPersonManager pgInPgPersonManager;
+@Resource
+private PGTagMacManager pgTagMacManager;
 
     @RequestMapping("query")
     @ResponseBody
@@ -31,9 +41,15 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String , Object> getRecentPosition()
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
     {
-        return pgTagPositionManager.getRecentPosition();
+        Map<String, Object> resultMap = new HashMap<>();
+        PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
+        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode());
+        PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac()));
+        resultMap.put("msg","success");
+        resultMap.put("result",new PGTagPositionDto(pgTagPosition));
+        return resultMap;
     }
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml
index 0378dfb..b728ef5 100644
--- a/src/main/resources/spring/taskConfig-applicationContext.xml
+++ b/src/main/resources/spring/taskConfig-applicationContext.xml
@@ -15,6 +15,7 @@
 
     <task:scheduled-tasks>
         <task:scheduled ref="PGTask" method="overtimeInPG" cron="0 0/20 * * * ?" />
+        <task:scheduled ref="PGTask" method="getMacPosition" cron="0 0/10 * * * ?" />
         <task:scheduled ref="PGTask" method="getAllMac" cron="0 0 0 0 1/1 ? "/>
     </task:scheduled-tasks>
 
diff --git a/tagMac.sql b/tagMac.sql
new file mode 100644
index 0000000..d24c521
--- /dev/null
+++ b/tagMac.sql
@@ -0,0 +1,287 @@
+???prompt PL/SQL Developer Export Tables for user ZHYQ@XE
+prompt Created by LenovoWork on 2019��8��20��
+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/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx"
new file mode 100644
index 0000000..f227417
--- /dev/null
+++ "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx"
Binary files differ

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 5aa38cb..270703a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGPositionDto.java
@@ -1,6 +1,8 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+
 public class PGPositionDto {
 
     public String tagMac;
@@ -78,6 +80,8 @@
         this.positionUpdateTime = positionUpdateTime;
     }
 
+
+
     @Override
     public String toString() {
         return "PGPositionDto{" +
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 57be186..a7eea2c 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/dto/PGTagPositionDto.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.overtimeInPG.dto;
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -104,6 +105,16 @@
         HostName = hostName;
     }
 
+    public PGTagPositionDto(PGTagPosition pgTagPosition){
+        this.setHostId(pgTagPosition.getHostId());
+        this.setCoordinatesName(pgTagPosition.getCoordinatesName());
+        this.setHostName(pgTagPosition.getHostName());
+        this.setTagMac(pgTagPosition.getTagMac());
+        this.setTagName(pgTagPosition.getTagName());
+        this.setX(pgTagPosition.getX());
+        this.setY(pgTagPosition.getY());
+    }
+
     @Override
     public String toString() {
         return "PGTagPositionDto{" +
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 0eb9245..ef4c54a 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -12,6 +12,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.persistence.ParameterMode;
+import javax.persistence.criteria.CriteriaBuilder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -40,6 +41,11 @@
         return retMap;
     }
 
+    public int getMaxId(String tagMac)
+    {
+        String hSql = "select max(id) from pg_tagposition where tagmac = '"+tagMac+"'";
+        return ((Integer)this.getSession().createSQLQuery(hSql).uniqueResult()).intValue();
+    }
 }
 
 
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
index 8cd5b86..a316bd0 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/task/SyncPGtask.java
@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.text.ParseException;
 
 //import org.springframework.stereotype.Component;
 //import java.util.List;
@@ -24,6 +25,7 @@
     public void getAllMac(){
         tagmacRun.getAllMac();
     };
+    public void getMacPosition() throws ParseException {tagmacRun.getMacPosition();};
     public static void main(String[] args) {
     }
 }
diff --git a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
index 4f14abf..c3f69f4 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -1,8 +1,14 @@
 package com.casic.PgInterface.overtimeInPG.web;
 
 
+import com.casic.PgInterface.overtimeInPG.domain.PGTagMac;
+import com.casic.PgInterface.overtimeInPG.domain.PGTagPosition;
+import com.casic.PgInterface.overtimeInPG.dto.PGTagPositionDto;
 import com.casic.PgInterface.overtimeInPG.manager.PGInOutRecManager;
+import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagPositionManager;
+import com.casic.PgInterface.patroler.domain.PgInPgPerson;
+import com.casic.PgInterface.patroler.manager.PgInPgPersonManager;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -19,6 +25,10 @@
 private PGInOutRecManager pgInOutRecManager;
 @Resource
 private PGTagPositionManager pgTagPositionManager;
+@Resource
+private PgInPgPersonManager pgInPgPersonManager;
+@Resource
+private PGTagMacManager pgTagMacManager;
 
     @RequestMapping("query")
     @ResponseBody
@@ -31,9 +41,15 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String , Object> getRecentPosition()
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
     {
-        return pgTagPositionManager.getRecentPosition();
+        Map<String, Object> resultMap = new HashMap<>();
+        PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
+        PGTagMac pgTagMac = pgTagMacManager.findUniqueBy("ASSETCODE",pgInPgPerson.getAssetCode());
+        PGTagPosition pgTagPosition = pgTagPositionManager.get(pgTagPositionManager.getMaxId(pgTagMac.getTagMac()));
+        resultMap.put("msg","success");
+        resultMap.put("result",new PGTagPositionDto(pgTagPosition));
+        return resultMap;
     }
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
diff --git a/src/main/resources/spring/taskConfig-applicationContext.xml b/src/main/resources/spring/taskConfig-applicationContext.xml
index 0378dfb..b728ef5 100644
--- a/src/main/resources/spring/taskConfig-applicationContext.xml
+++ b/src/main/resources/spring/taskConfig-applicationContext.xml
@@ -15,6 +15,7 @@
 
     <task:scheduled-tasks>
         <task:scheduled ref="PGTask" method="overtimeInPG" cron="0 0/20 * * * ?" />
+        <task:scheduled ref="PGTask" method="getMacPosition" cron="0 0/10 * * * ?" />
         <task:scheduled ref="PGTask" method="getAllMac" cron="0 0 0 0 1/1 ? "/>
     </task:scheduled-tasks>
 
diff --git a/tagMac.sql b/tagMac.sql
new file mode 100644
index 0000000..d24c521
--- /dev/null
+++ b/tagMac.sql
@@ -0,0 +1,287 @@
+???prompt PL/SQL Developer Export Tables for user ZHYQ@XE
+prompt Created by LenovoWork on 2019��8��20��
+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/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx" "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx"
new file mode 100644
index 0000000..f227417
--- /dev/null
+++ "b/\345\205\245\345\273\212\345\234\250\345\273\212\344\272\272\345\221\230\345\256\232\344\275\21520190820.docx"
Binary files differ
diff --git "a/\345\205\245\345\273\212\350\266\205\346\227\266\345\212\237\350\203\275\351\205\215\347\275\256\350\257\264\346\230\216.txt" "b/\345\205\245\345\273\212\350\266\205\346\227\266\345\212\237\350\203\275\351\205\215\347\275\256\350\257\264\346\230\216.txt"
index fb2884e..10c1c47 100644
--- "a/\345\205\245\345\273\212\350\266\205\346\227\266\345\212\237\350\203\275\351\205\215\347\275\256\350\257\264\346\230\216.txt"
+++ "b/\345\205\245\345\273\212\350\266\205\346\227\266\345\212\237\350\203\275\351\205\215\347\275\256\350\257\264\346\230\216.txt"
@@ -2,7 +2,8 @@
 
 ��̨��������Spring task
 1��getAllMac ÿ�»�ȡ����һ�������豸��Ϣ���洢�����ݿ�
-2��overtimeInPG ���ȳ�ʱ������⣬���Ƚ�����±������ݣ�Ĭ��ִ�м��20���ӣ������á�
+2��getMacPosition �豸�켣��Ϣ��ȡ��Ĭ��ִ�м��10���ӡ�
+3��overtimeInPG ���ȳ�ʱ������⣬���Ƚ�����±������ݣ�Ĭ��ִ�м��20���ӣ������á�
 task �����ļ�taskConfig-applicationContext.xml
 
 �ⲿ�ӿ��������application.properties