diff --git a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java
index 54bcbd85..f186ee90 100644
--- a/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java
+++ b/stwzhj-modules/wzhj-data2es/src/main/java/org/dromara/data2es/handler/RequestHandler.java
@@ -151,7 +151,7 @@ public class RequestHandler {
 
             long betweenS = DateUtil.between(gpsTime, new Date(), DateUnit.SECOND);
             //过期时间应该是20分钟减去设备定位时间与当前时间的差值，比如设备已经比当前时间晚15分钟了，那么设备的过期时间应该只剩5分钟了
-            long onlineTime = 60*10 - betweenS;
+            long onlineTime = 60*30 - betweenS;
 
             String deviceCode = esGpsInfoVo2.getDeviceCode();
             String deviceType = esGpsInfoVo2.getDeviceType();
diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
index 42e5b03e..540fcd73 100644
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
@@ -76,7 +76,6 @@ public class TDeviceServiceImpl implements ITDeviceService {
      */
     @Override
     public TableDataInfo<TDeviceVo> queryPageList(TDeviceBo bo, PageQuery pageQuery) {
-        bo.setValid(1);
         LambdaQueryWrapper<TDevice> lqw = buildQueryWrapper(bo);
         Page<TDeviceVo> result = baseMapper.selectPageDevicetList(pageQuery.build(), lqw);
         List<TDeviceVo> list = result.getRecords();