diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java
index e4e5b756a..83cc110b0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java
@@ -7,16 +7,20 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev;
 import com.zhgd.xmgl.modules.smoke.service.ISmokeDevService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 
@@ -161,5 +165,12 @@ public class SmokeDevController {
         return result;
     }
 
-
+    @ApiOperation(value = "统计烟感报警设备", notes = "统计烟感报警设备", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+    })
+    @PostMapping(value = "/countSmokeDev")
+    public Result<CountSmokeDev> countSmokeDev(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(smokeDevService.countSmokeDev(paramMap));
+    }
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
index 0b2790b59..8a4de495c 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/SmokeDevAlarm.java
@@ -140,4 +140,8 @@ public class SmokeDevAlarm implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @TableField(exist = false)
     private Date queryEndTime;
+    @TableField(exist = false)
+    @DateTimeFormat(pattern = "查询参数：1今天")
+    private Integer type;
+
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java
new file mode 100644
index 000000000..5e4853769
--- /dev/null
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java
@@ -0,0 +1,14 @@
+package com.zhgd.xmgl.modules.smoke.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CountSmokeDev {
+    @ApiModelProperty("设备总数")
+    private Integer total;
+    @ApiModelProperty("在线设备总数")
+    private Integer onlineNum;
+    @ApiModelProperty("离线设备总数")
+    private Integer offLineNum;
+}
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java
index 2259dcb8c..ba8d03c30 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java
@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev;
 import org.apache.ibatis.annotations.Mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+
 /**
  * @Description: 烟感报警设备
  * @author： pds
@@ -19,4 +22,6 @@ import org.apache.ibatis.annotations.Param;
 public interface SmokeDevMapper extends BaseMapper<SmokeDev> {
 
     IPage<SmokeDev> queryWrapper(Page<SmokeDev> page, @Param(Constants.WRAPPER) QueryWrapper<SmokeDev> queryWrapper);
+
+    CountSmokeDev countSmokeDev(HashMap<String, Object> paramMap);
 }
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 4ae9a8a11..a2c744897 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
@@ -7,4 +7,13 @@
         ti on ti.id=sd.duty_team_info_id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="countSmokeDev" resultType="com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev">
+        select
+        count(*) total,
+        count(*) onlineNum,
+        0 offLineNum
+        from smoke_dev
+        where project_sn=#{projectSn}
+    </select>
 </mapper>
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java
index 711cdc865..766d0fb02 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java
@@ -3,8 +3,10 @@ package com.zhgd.xmgl.modules.smoke.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 
 /**
  * @Description: 烟感报警设备
@@ -19,4 +21,6 @@ public interface ISmokeDevService extends IService<SmokeDev> {
     void add(SmokeDev smokeDev);
 
     void edit(SmokeDev smokeDev);
+
+    CountSmokeDev countSmokeDev(HashMap<String, Object> paramMap);
 }
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 2b2159392..17a591c3a 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
@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Objects;
 
 /**
  * @Description: 烟感报警数据
@@ -66,7 +67,10 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
         queryWrapper.ge(smokeDevAlarm.getQueryStartTime() != null, RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), smokeDevAlarm.getQueryStartTime())
                 .le(smokeDevAlarm.getQueryEndTime() != null, RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), smokeDevAlarm.getQueryEndTime() != null ? DateUtil.endOfDay(smokeDevAlarm.getQueryEndTime()) : null)
                 .orderByDesc(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime));
-        Page<SmokeDevAlarm> page = new Page<SmokeDevAlarm>(pageNo, pageSize);
+        if (Objects.equals(smokeDevAlarm.getType(), 1)) {
+            queryWrapper.ge(RefUtil.fieldNameUlc(SmokeDevAlarm::getAlarmTime), DateUtil.today());
+        }
+        Page<SmokeDevAlarm> page = new Page<>(pageNo, pageSize);
         return smokeDevAlarmMapper.queryPageList(page, queryWrapper);
     }
 
diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java
index 852adbddd..66065a28d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev;
 import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper;
 import com.zhgd.xmgl.modules.smoke.service.ISmokeDevService;
 import com.zhgd.xmgl.util.RefUtil;
@@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 
 /**
  * @Description: 烟感报警设备
@@ -55,4 +57,9 @@ public class SmokeDevServiceImpl extends ServiceImpl<SmokeDevMapper, SmokeDev> i
         updateById(smokeDev);
     }
 
+    @Override
+    public CountSmokeDev countSmokeDev(HashMap<String, Object> paramMap) {
+        return smokeDevMapper.countSmokeDev(paramMap);
+    }
+
 }