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 6660e8d..33cc1cd 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -30,7 +30,7 @@
     {
         Criteria criteria = createCriteria(PGTagPosition.class);
         criteria.add(Restrictions.and(Restrictions.eq("hostId",hostId),Restrictions.eq("positionUpdatetime",dateStr)));
-        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-1 and sysdate"));
+        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-10 and sysdate"));
         return  criteria.setMaxResults(1).list().size()>0;
     }
 

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 6660e8d..33cc1cd 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -30,7 +30,7 @@
     {
         Criteria criteria = createCriteria(PGTagPosition.class);
         criteria.add(Restrictions.and(Restrictions.eq("hostId",hostId),Restrictions.eq("positionUpdatetime",dateStr)));
-        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-1 and sysdate"));
+        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-10 and sysdate"));
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index 1e33ca3..b307e25 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -73,11 +73,13 @@
 //        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
 //        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
-        pgTagPositionManager.save(pgTagPosition);
+        boolean bExist = false;
+        bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
+        if (!bExist)
+            pgTagPositionManager.save(pgTagPosition);
 
         String coorName = pgTagPosition.getCoordinatesName();
         System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区")));
-//        PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP")));
         PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区")));
 
         Map<Object,Object> resMap = new HashMap<>();
@@ -107,9 +109,9 @@
 
         Map<Object,Object> mapPosition = new HashMap<>();
         if(pgInPgStatus.getOutTime() == null)
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
         else
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
 
         JSONObject jsonObject = JSONObject.fromObject(pgTagMac);
         jsonObject.remove("id");

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 6660e8d..33cc1cd 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -30,7 +30,7 @@
     {
         Criteria criteria = createCriteria(PGTagPosition.class);
         criteria.add(Restrictions.and(Restrictions.eq("hostId",hostId),Restrictions.eq("positionUpdatetime",dateStr)));
-        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-1 and sysdate"));
+        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-10 and sysdate"));
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index 1e33ca3..b307e25 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -73,11 +73,13 @@
 //        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
 //        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
-        pgTagPositionManager.save(pgTagPosition);
+        boolean bExist = false;
+        bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
+        if (!bExist)
+            pgTagPositionManager.save(pgTagPosition);
 
         String coorName = pgTagPosition.getCoordinatesName();
         System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区")));
-//        PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP")));
         PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区")));
 
         Map<Object,Object> resMap = new HashMap<>();
@@ -107,9 +109,9 @@
 
         Map<Object,Object> mapPosition = new HashMap<>();
         if(pgInPgStatus.getOutTime() == null)
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
         else
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
 
         JSONObject jsonObject = JSONObject.fromObject(pgTagMac);
         jsonObject.remove("id");
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index f0b936c..ca65da3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
@@ -49,7 +50,8 @@
                                              @FormParam("userCode") String userCode,
                                              @FormParam("phoneNumber") String phoneNumber,
                                              @FormParam("personType") String personType,
-                                             @FormParam("assetCode") String assetCode) throws Exception {
+                                             @FormParam("assetCode") String assetCode,
+                                             @FormParam("inTime") String inTime) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
@@ -57,7 +59,7 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
 //            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
@@ -79,9 +81,19 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+
+                PgInPgStatus pgInPgStatus=new PgInPgStatus();
+
+                if(inTime!=null)
+                    pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime));
+                pgInPgStatus.setPgInPgPersonId(pgInPgPerson1);
+
+                pgInPgStatusManager.save(pgInPgStatus);
+
+//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
                 result = "true";
-                msg = "人员注册保存成功"+syResult;
+//                msg = "人员注册保存成功"+syResult;
+                msg = "人员注册保存成功";
             }
             else {
                 result = "false";

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 6660e8d..33cc1cd 100644
--- a/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
+++ b/src/main/java/com/casic/PgInterface/overtimeInPG/manager/PGTagPositionManager.java
@@ -30,7 +30,7 @@
     {
         Criteria criteria = createCriteria(PGTagPosition.class);
         criteria.add(Restrictions.and(Restrictions.eq("hostId",hostId),Restrictions.eq("positionUpdatetime",dateStr)));
-        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-1 and sysdate"));
+        criteria.add(Restrictions.sqlRestriction(" queryTime between sysdate-10 and sysdate"));
         return  criteria.setMaxResults(1).list().size()>0;
     }
 
diff --git a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
index 1e33ca3..b307e25 100644
--- a/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PGInOutRecRs.java
@@ -73,11 +73,13 @@
 //        long maxId = pgTagPositionManager.getMaxId(pgTagMac.getTagMac());
 //        PGTagPosition pgTagPosition = pgTagPositionManager.get(maxId);
         PGTagPosition pgTagPosition = tagmacRun.GetTagStatus(pgTagMac);
-        pgTagPositionManager.save(pgTagPosition);
+        boolean bExist = false;
+        bExist = pgTagPositionManager.findTagPosition(pgTagPosition.getPositionUpdatetime(),pgTagPosition.getHostId());
+        if (!bExist)
+            pgTagPositionManager.save(pgTagPosition);
 
         String coorName = pgTagPosition.getCoordinatesName();
         System.out.println("position:"+coorName.substring(0,coorName.indexOf("号分区")));
-//        PgDevice pgDevice = pgDeviceManager.findUniqueBy("devcode",coorName.substring(coorName.indexOf("AP")));
         PgDevice pgDevice = pgDeviceManager.findUniqueBy("pipeGallery",coorName.substring(0,coorName.indexOf("号分区")));
 
         Map<Object,Object> resMap = new HashMap<>();
@@ -107,9 +109,9 @@
 
         Map<Object,Object> mapPosition = new HashMap<>();
         if(pgInPgStatus.getOutTime() == null)
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),new Date(),pgTagMac.getHostId());
         else
-            mapPosition = pgTagPositionManager.getHisByHostId(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
+            mapPosition = pgTagPositionManager.getHisByHostIdView(pgInPgStatus.getInTime(),pgInPgStatus.getOutTime(),pgTagMac.getHostId());
 
         JSONObject jsonObject = JSONObject.fromObject(pgTagMac);
         jsonObject.remove("id");
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index f0b936c..ca65da3 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -1,5 +1,6 @@
 package com.casic.PgInterface.rs;
 
+import com.casic.PgInterface.core.util.DateUtils;
 import com.casic.PgInterface.devTable.dto.PgDeviceDto;
 import com.casic.PgInterface.devTable.manager.PgDeviceManager;
 import com.casic.PgInterface.overtimeInPG.manager.PGTagMacManager;
@@ -49,7 +50,8 @@
                                              @FormParam("userCode") String userCode,
                                              @FormParam("phoneNumber") String phoneNumber,
                                              @FormParam("personType") String personType,
-                                             @FormParam("assetCode") String assetCode) throws Exception {
+                                             @FormParam("assetCode") String assetCode,
+                                             @FormParam("inTime") String inTime) throws Exception {
         Map<String, Object> resultMap = new HashMap<>();
         String result = "";
         String msg = "";
@@ -57,7 +59,7 @@
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
         try {
-            PgInPgPerson pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName);
+            PgInPgPerson pgInPgPerson = null;//pgInPgPersonManager.getPersonByUserName(userName);
             int iHostName = pgTagMacManager.getCount("select count(1) from PGTagMac where hostname = ?",assetCode);
 //            int iTagMac = pgTagMacManager.getCount("select count(1) from PGTagMac where tagmac = ?",assetCode.toUpperCase());
             if (0==iHostName)
@@ -79,9 +81,19 @@
                 pgInPgPerson1.setAssetCode(assetCode);
 
                 pgInPgPersonManager.save(pgInPgPerson1);
-                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
+
+                PgInPgStatus pgInPgStatus=new PgInPgStatus();
+
+                if(inTime!=null)
+                    pgInPgStatus.setInTime(DateUtils.sdf4.parse(inTime));
+                pgInPgStatus.setPgInPgPersonId(pgInPgPerson1);
+
+                pgInPgStatusManager.save(pgInPgStatus);
+
+//                String syResult=pgInPgPersonManager.synchorizedInPgInfo(assetCode,userCode,userName,personType);
                 result = "true";
-                msg = "人员注册保存成功"+syResult;
+//                msg = "人员注册保存成功"+syResult;
+                msg = "人员注册保存成功";
             }
             else {
                 result = "false";
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index a6da81e..daf99bd 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -14,10 +14,12 @@
 # db
 # ============================================================================
 db.default.driverClassName=oracle.jdbc.driver.OracleDriver
-#db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
-db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
-db.default.username=PG
-db.default.password=PG
+db.default.url=jdbc:oracle:thin:@172.17.0.201:1521:szgl
+#db.default.url=jdbc:oracle:thin:@119.254.103.80:1521:chengdu
+db.default.username=scott
+db.default.password=scott
+#db.default.username=PG
+#db.default.password=PG
 
 
 # ============================================================================