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 ef4c54a..3bd4025 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -28,16 +28,15 @@
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
-    public Map<String,Object> getRecentPosition()
+    public Map<String,Object> getAllPosition()
     {
         Map<String,Object> retMap = new HashMap<>();
         List<PGPositionDto> pgPositionDtoList ;
         String querySql = " select * from tagPositionView ";
         SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionDto.class));
         pgPositionDtoList = sqlQuery.list();
-        retMap.put("code",200);
         retMap.put("message","success");
-        retMap.put("data",pgPositionDtoList);
+        retMap.put("result",pgPositionDtoList);
         return retMap;
     }
 

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 ef4c54a..3bd4025 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -28,16 +28,15 @@
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
-    public Map<String,Object> getRecentPosition()
+    public Map<String,Object> getAllPosition()
     {
         Map<String,Object> retMap = new HashMap<>();
         List<PGPositionDto> pgPositionDtoList ;
         String querySql = " select * from tagPositionView ";
         SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionDto.class));
         pgPositionDtoList = sqlQuery.list();
-        retMap.put("code",200);
         retMap.put("message","success");
-        retMap.put("data",pgPositionDtoList);
+        retMap.put("result",pgPositionDtoList);
         return retMap;
     }
 
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 c3f69f4..74f636b 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -19,7 +19,8 @@
 import java.util.Map;
 
 @Controller
-@RequestMapping("InOutPGrec")
+@RequestMapping("rs")
+//@RequestMapping("InOutPGrec")
 public class PGInOutRecController {
 @Resource
 private PGInOutRecManager pgInOutRecManager;
@@ -41,7 +42,7 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId)
     {
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
@@ -51,12 +52,12 @@
         resultMap.put("result",new PGTagPositionDto(pgTagPosition));
         return resultMap;
     }
+
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
     public Map<String , Object> getHistoryByTagmac()
     {
         Map<String,Object> resultMap = new HashMap<>();
-
         return resultMap;
     }
 }

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 ef4c54a..3bd4025 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -28,16 +28,15 @@
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
-    public Map<String,Object> getRecentPosition()
+    public Map<String,Object> getAllPosition()
     {
         Map<String,Object> retMap = new HashMap<>();
         List<PGPositionDto> pgPositionDtoList ;
         String querySql = " select * from tagPositionView ";
         SQLQuery sqlQuery = (SQLQuery) this.getSession().createSQLQuery(querySql).setResultTransformer(Transformers.aliasToBean(PGPositionDto.class));
         pgPositionDtoList = sqlQuery.list();
-        retMap.put("code",200);
         retMap.put("message","success");
-        retMap.put("data",pgPositionDtoList);
+        retMap.put("result",pgPositionDtoList);
         return retMap;
     }
 
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 c3f69f4..74f636b 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/web/PGInOutRecController.java
@@ -19,7 +19,8 @@
 import java.util.Map;
 
 @Controller
-@RequestMapping("InOutPGrec")
+@RequestMapping("rs")
+//@RequestMapping("InOutPGrec")
 public class PGInOutRecController {
 @Resource
 private PGInOutRecManager pgInOutRecManager;
@@ -41,7 +42,7 @@
 
     @RequestMapping("getRecentPosition")
     @ResponseBody
-    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) int inPgPersonId)
+    public Map<String,Object> getRecentPosition(@RequestParam(value = "inPgPersonId",required = true) long inPgPersonId)
     {
         Map<String, Object> resultMap = new HashMap<>();
         PgInPgPerson pgInPgPerson = pgInPgPersonManager.get(inPgPersonId);
@@ -51,12 +52,12 @@
         resultMap.put("result",new PGTagPositionDto(pgTagPosition));
         return resultMap;
     }
+
     @RequestMapping("getHistoryByTagmac")
     @ResponseBody
     public Map<String , Object> getHistoryByTagmac()
     {
         Map<String,Object> resultMap = new HashMap<>();
-
         return resultMap;
     }
 }
diff --git a/tagMac.sql b/tagMac.sql
index d24c521..163d9a2 100644
--- a/tagMac.sql
+++ b/tagMac.sql
@@ -1,5 +1,5 @@
-???prompt PL/SQL Developer Export Tables for user ZHYQ@XE
-prompt Created by LenovoWork on 2019��8��20��
+prompt PL/SQL Developer Export Tables for user ZHYQ@XE
+prompt Created by LenovoWork on 2019820
 set feedback off
 set define off