diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
index fc48bbdf6..dfc1a3963 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarPassRecordController.java
@@ -96,7 +96,7 @@ public class CarPassRecordController {
             @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "body", required = true, dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "body", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "body", required = true, dataType = "Integer"),
-            @ApiImplicitParam(name = "type", value = "1今日2历史", paramType = "body", required = true, dataType = "Integer"),
+            @ApiImplicitParam(name = "timeType", value = "1今日2历史", paramType = "body", required = true, dataType = "Integer"),
     })
     @PostMapping(value = {"/list", "/page"})
     public Result<IPage<CarPassRecord>> queryPageList(@RequestBody Map<String, Object> map) {
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
index d364449fe..ad30ee435 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarPassRecordMapper.xml
@@ -186,7 +186,7 @@
         <if test="param.type != null">
             and a.type = #{param.type}
         </if>
-        <if test="param.type == '1'.toString()">
+        <if test="timeType.type == '1'.toString()">
             and a.pass_time >= current_date
         </if>
         order by a.pass_time desc
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml
index a2c744897..bfac4ab9b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml
@@ -2,7 +2,10 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper">
     <select id="queryWrapper" resultType="com.zhgd.xmgl.modules.smoke.entity.SmokeDev">
-        select sd.*,ti.team_name dutyTeamInfoName,1 online
+        select sd.*,ti.team_name dutyTeamInfoName,IFNULL(((case
+        when round((UNIX_TIMESTAMP(now()) - UNIX_TIMESTAMP(upload_date)) / 60) &lt;= 2880
+        then 1
+        else 0 end)),0) online
         from smoke_dev sd left join team_info
         ti on ti.id=sd.duty_team_info_id
         ${ew.customSqlSegment}
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
index 254332a16..c41b4bbb7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java
@@ -51,15 +51,20 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
             log.error("设备不存在");
             return "1";
         }
-        smokeDev.setUploadDate(new Date());
-        smokeDevMapper.updateById(smokeDev);
-        SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
-        smokeDevAlarm.setDevSn(deviceid);
-        smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime())));
-        smokeDevAlarm.setDeviceStatus(dto.getAlarm());
-        smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
-        smokeDevAlarm.setAlarmDetailStatus(dto.getState());
-        smokeDevAlarmMapper.insert(smokeDevAlarm);
+        Date date = new Date();
+        if (Objects.equals(dto.getAlarm(), 2)) {
+            //心跳
+            smokeDev.setUploadDate(date);
+            smokeDevMapper.updateById(smokeDev);
+        } else if (Objects.equals(dto.getAlarm(), 1)) {
+            SmokeDevAlarm smokeDevAlarm = new SmokeDevAlarm();
+            smokeDevAlarm.setDevSn(deviceid);
+            smokeDevAlarm.setAlarmTime(new Date(Long.valueOf(dto.getTime())));
+            smokeDevAlarm.setDeviceStatus(dto.getAlarm());
+            smokeDevAlarm.setProjectSn(smokeDev.getProjectSn());
+            smokeDevAlarm.setAlarmDetailStatus(dto.getState());
+            smokeDevAlarmMapper.insert(smokeDevAlarm);
+        }
         return "0";
     }