大屏接口

src/main/java/com/zhgd/xmgl/enums/ParamEnum.java

@@ -423,4 +423,41 @@ public class ParamEnum {
             this.desc = desc;
         }
     }
+
+    /**
+     * 气体类型（1氧气、2甲烷、3一氧化碳、4硫化氢）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PoisonousGasDevAlarmGasTypeEnum implements BaseEnum {
+        OXYGEN(1, "氧气"),
+        METHANE(2, "甲烷"),
+        CARBON_MONOXIDE(3, "一氧化碳"),
+        HYDROGEN_SULFIDE(4, "硫化氢"),
+        ;
+
+        PoisonousGasDevAlarmGasTypeEnum(Integer value, String desc) {
+            this.value = value;
+            this.desc = desc;
+        }
+
+        private Integer value;
+        private String desc;
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public void setValue(Integer value) {
+            this.value = value;
+        }
+
+        public String getDesc() {
+            return desc;
+        }
+
+        public void setDesc(String desc) {
+            this.desc = desc;
+        }
+    }
+
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevAlarmController.java

@@ -6,16 +6,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm;
 import com.zhgd.xmgl.modules.poisonous.service.IPoisonousGasDevAlarmService;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 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.*;
@@ -164,5 +168,15 @@ public class PoisonousGasDevAlarmController {
         return result;
     }
 
+    @ApiOperation(value = "气体含量报警统计（统计每种气体报警数量）", notes = "气体含量报警统计（统计每种气体报警数量）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "1今天2一个月内3一年内", paramType = "body", required = true, dataType = "Integer"),
+    })
+    @PostMapping(value = "/countPoisonousGasDevAlarmGasType")
+    public Result<SectorVo> countPoisonousGasDevAlarmGasType(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(poisonousGasDevAlarmService.countPoisonousGasDevAlarmGasType(paramMap));
+    }
+
 
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevCurrentDataController.java

@@ -5,10 +5,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevCurrentData;
 import com.zhgd.xmgl.modules.poisonous.service.IPoisonousGasDevCurrentDataService;
 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.apache.commons.collections.MapUtils;
@@ -164,5 +167,15 @@ public class PoisonousGasDevCurrentDataController {
         return poisonousGasDevCurrentDataService.exportXls(request, response, poisonousGasDevCurrentData);
     }
 
+    @ApiOperation(value = "氧气等含量监测（统计不同时间的气体含量走势）", notes = "氧气等含量监测（统计不同时间的气体含量走势）", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "type", value = "1今天", paramType = "body", required = true, dataType = "Integer"),
+    })
+    @PostMapping(value = "/countPoisonousGasDevCurrentDataGasType")
+    public Result<List<TrendVo>> countPoisonousGasDevCurrentDataGasType(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(poisonousGasDevCurrentDataService.countPoisonousGasDevCurrentDataGasType(paramMap));
+    }
+
 
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDevAlarm.java

@@ -126,7 +126,8 @@ public class PoisonousGasDevAlarm implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
-
+    @ApiModelProperty(value = "气体类型（1氧气、2甲烷、3一氧化碳、4硫化氢）")
+    private Integer gasType;
 
     @ApiModelProperty(value = "设备名称")
     @TableField(exist = false)

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevAlarmMapper.java

@@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.base.entity.vo.SectorOneVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * @Description: 有毒气体-报警
  * @author： pds
@@ -19,4 +23,6 @@ import org.apache.ibatis.annotations.Param;
 public interface PoisonousGasDevAlarmMapper extends BaseMapper<PoisonousGasDevAlarm> {
 
     IPage<PoisonousGasDevAlarm> queryPageList(Page<PoisonousGasDevAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<PoisonousGasDevAlarm> queryWrapper);
+
+    List<SectorOneVo> countPoisonousGasDevAlarmGasType(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevCurrentDataMapper.java

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.base.entity.vo.TrendVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevCurrentData;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -25,4 +27,6 @@ public interface PoisonousGasDevCurrentDataMapper extends BaseMapper<PoisonousGa
     IPage<PoisonousGasDevCurrentData> queryPageList(Page<PoisonousGasDevCurrentData> page, @Param(Constants.WRAPPER) QueryWrapper<PoisonousGasDevCurrentData> queryWrapper);
 
     List<PoisonousGasDevCurrentData> queryList(@Param(Constants.WRAPPER) QueryWrapper<PoisonousGasDevCurrentData> queryWrapper);
+
+    List<TrendVo> countPoisonousGasDevCurrentDataGasType(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml

@@ -9,4 +9,25 @@
         left join system_user su on su.user_id=pgda.operate_id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="countPoisonousGasDevAlarmGasType" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
+        select count(*) count, gas_type enumType from poisonous_gas_dev_alarm
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="devSn != null and devSn != ''">
+            and dev_sn = #{devSn}
+        </if>
+        <if test="type == '1'.toString()">
+            and alarm_time >= current_date
+        </if>
+        <if test="type == '2'.toString()">
+            and alarm_time >= date_sub(current_date,interval 30 day)
+        </if>
+        <if test="type == '3'.toString()">
+            and alarm_time >= date_sub(current_date,interval 365 day)
+        </if>
+        group by gas_type
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevCurrentDataMapper.xml

@@ -28,4 +28,20 @@
         pgd.dev_sn=pgdcd.dev_sn
         ${ew.customSqlSegment}
     </select>
+
+    <select id="countPoisonousGasDevCurrentDataGasType" resultType="com.zhgd.xmgl.base.entity.vo.TrendVo">
+        select date_format(upload_time,'%Y-%m-%d %H:00') x,round(ifnull(avg(gas_val),0),4) y from
+        poisonous_gas_dev_current_data
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+        <if test="gasType != null and gasType != ''">
+            and gas_type = #{gasType}
+        </if>
+        <if test="type == '1'.toString()">
+            and upload_time >= current_date
+        </if>
+        group by x
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevAlarmService.java

@@ -1,10 +1,12 @@
 package com.zhgd.xmgl.modules.poisonous.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 
 /**
  * @Description: 有毒气体-报警
@@ -15,4 +17,6 @@ import javax.servlet.http.HttpServletRequest;
 public interface IPoisonousGasDevAlarmService extends IService<PoisonousGasDevAlarm> {
 
     IPage<PoisonousGasDevAlarm> queryPageList(PoisonousGasDevAlarm poisonousGasDevAlarm, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+    SectorVo countPoisonousGasDevAlarmGasType(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevCurrentDataService.java

@@ -1,12 +1,14 @@
 package com.zhgd.xmgl.modules.poisonous.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.zhgd.xmgl.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevCurrentData;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -28,4 +30,6 @@ public interface IPoisonousGasDevCurrentDataService extends IService<PoisonousGa
     void add(PoisonousGasDevCurrentData poisonousGasDevCurrentData);
 
     void addDataFromTcpFor212Protocol(String str);
+
+    List<TrendVo> countPoisonousGasDevCurrentDataGasType(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
+import com.zhgd.xmgl.base.entity.vo.SectorOneVo;
+import com.zhgd.xmgl.base.entity.vo.SectorVo;
+import com.zhgd.xmgl.enums.ParamEnum;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm;
 import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevAlarmMapper;
 import com.zhgd.xmgl.modules.poisonous.service.IPoisonousGasDevAlarmService;
@@ -15,6 +18,8 @@ import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * @Description: 有毒气体-报警
@@ -36,4 +41,10 @@ public class PoisonousGasDevAlarmServiceImpl extends ServiceImpl<PoisonousGasDev
         Page<PoisonousGasDevAlarm> page = new Page<PoisonousGasDevAlarm>(pageNo, pageSize);
         return poisonousGasDevAlarmMapper.queryPageList(page, queryWrapper);
     }
+
+    @Override
+    public SectorVo countPoisonousGasDevAlarmGasType(HashMap<String, Object> paramMap) {
+        List<SectorOneVo> list = baseMapper.countPoisonousGasDevAlarmGasType(paramMap);
+        return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values());
+    }
 }

src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevCurrentDataServiceImpl.java

@@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.poisonous.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -10,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.base.entity.vo.TrendVo;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDev;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevAlarm;
 import com.zhgd.xmgl.modules.poisonous.entity.PoisonousGasDevCurrentData;
@@ -19,8 +21,10 @@ import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevAlarmMapper;
 import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevCurrentDataMapper;
 import com.zhgd.xmgl.modules.poisonous.mapper.PoisonousGasDevMapper;
 import com.zhgd.xmgl.modules.poisonous.service.IPoisonousGasDevCurrentDataService;
+import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.RefUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -225,13 +229,23 @@ public class PoisonousGasDevCurrentDataServiceImpl extends ServiceImpl<Poisonous
         insertCurrentData(devSn, 4, iDataArr, 3, poisonousGasDev, 0, dateTime);
         insertCurrentData(devSn, 3, iDataArr, 4, poisonousGasDev, 0, dateTime);
 
-        insertAlarmIf(devSn, "甲烷", dateTime, poisonousGasDev, iDataArr, 1, 1);
+        insertAlarmIf(devSn, "甲烷", dateTime, poisonousGasDev, iDataArr, 1, 1, 2);
-        insertAlarmIf(devSn, "氧气", dateTime, poisonousGasDev, iDataArr, 2, 2);
+        insertAlarmIf(devSn, "氧气", dateTime, poisonousGasDev, iDataArr, 2, 2, 1);
-        insertAlarmIf(devSn, "硫化氢", dateTime, poisonousGasDev, iDataArr, 3, 0);
+        insertAlarmIf(devSn, "硫化氢", dateTime, poisonousGasDev, iDataArr, 3, 0, 4);
-        insertAlarmIf(devSn, "一氧化碳", dateTime, poisonousGasDev, iDataArr, 4, 0);
+        insertAlarmIf(devSn, "一氧化碳", dateTime, poisonousGasDev, iDataArr, 4, 0, 3);
     }
 
-    private void insertAlarmIf(String devSn, String monitorObject, DateTime dateTime, PoisonousGasDev poisonousGasDev, String[] iDataArr, int x, int unit) {
+    @Override
+    public List<TrendVo> countPoisonousGasDevCurrentDataGasType(HashMap<String, Object> paramMap) {
+        Integer type = MapUtils.getInteger(paramMap, "type");
+        if (Objects.equals(type, 1)) {
+            List<TrendVo> list = baseMapper.countPoisonousGasDevCurrentDataGasType(paramMap);
+            return TrendVo.fillTrendVos(list, DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"), "HH:00");
+        }
+        return null;
+    }
+
+    private void insertAlarmIf(String devSn, String monitorObject, DateTime dateTime, PoisonousGasDev poisonousGasDev, String[] iDataArr, int x, int unit, int gasType) {
         //0正常,1故障,2超量程,3A2报警,4A1报警
         String gasEq = iDataArr[x];
         String[] dataAndAlarmArr = StringUtils.split(gasEq, ",");
@@ -246,6 +260,7 @@ public class PoisonousGasDevCurrentDataServiceImpl extends ServiceImpl<Poisonous
             devAlarm1.setGasVal(Double.valueOf(StringUtils.split(dataAndAlarmArr[0], "=")[1]));
             devAlarm1.setUnit(unit);
             devAlarm1.setAlarmType(getAlarmType(flag));
+            devAlarm1.setGasType(gasType);
             poisonousGasDevAlarmMapper.insert(devAlarm1);
         }
     }

src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevAlarmController.java

@@ -8,12 +8,15 @@ import com.zhgd.jeecg.common.api.vo.Result;
 import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.jeecg.common.util.oConvertUtils;
 import com.zhgd.xmgl.modules.smoke.entity.AddAlarmDto;
+import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo;
 import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService;
 import com.zhgd.xmgl.security.entity.UserInfo;
 import com.zhgd.xmgl.security.util.SecurityUtils;
 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.jeecgframework.poi.excel.def.NormalExcelConstants;
@@ -22,12 +25,14 @@ import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -196,4 +201,13 @@ public class SmokeDevAlarmController {
     }
 
 
+    @ApiOperation(value = "统计烟感报警数据", notes = "统计烟感报警数据", httpMethod = "POST")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
+    })
+    @PostMapping(value = "/countSmokeDevAlarm")
+    public Result<CountSmokeDevAlarmVo> countSmokeDevAlarm(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
+        return Result.success(smokeDevAlarmService.countSmokeDevAlarm(paramMap));
+    }
+
 }

src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDevAlarmVo.java

@@ -0,0 +1,14 @@
+package com.zhgd.xmgl.modules.smoke.entity.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class CountSmokeDevAlarmVo {
+    @ApiModelProperty("今日告警数量")
+    private Integer todayAlertNum;
+    @ApiModelProperty("当月告警数量")
+    private Integer monthAlertNum;
+    @ApiModelProperty("累计告警数量")
+    private Integer totalAlertNum;
+}

src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevAlarmMapper.java

@@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.vo.CountSmokeDevAlarmVo;
 import org.apache.ibatis.annotations.Mapper;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm;
 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 SmokeDevAlarmMapper extends BaseMapper<SmokeDevAlarm> {
 
     IPage<SmokeDevAlarm> queryPageList(Page<SmokeDevAlarm> page, @Param(Constants.WRAPPER) QueryWrapper<SmokeDevAlarm> queryWrapper);
+
+    CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml

@@ -8,4 +8,16 @@
         left join system_user su on su.user_id=sda.operate_id
         ${ew.customSqlSegment}
     </select>
+
+    <select id="countSmokeDevAlarm" resultType="com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo">
+        select
+        ifnull(sum(if(alarm_time>current_date,1,0)),0) todayAlertNum,
+        ifnull(sum(if(alarm_time>concat(date_format(current_date,'%Y-%m'),'-01'),1,0)),0) monthAlertNum,
+        count(*) totalAlertNum
+        from smoke_dev_alarm
+        where 1=1
+        <if test="projectSn != null and projectSn != ''">
+            and project_sn = #{projectSn}
+        </if>
+    </select>
 </mapper>

src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevAlarmService.java

@@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zhgd.xmgl.modules.smoke.entity.AddAlarmDto;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 
 /**
  * @Description: 烟感报警数据
@@ -18,4 +20,6 @@ public interface ISmokeDevAlarmService extends IService<SmokeDevAlarm> {
     String addAlarm(AddAlarmDto dto);
 
     IPage<SmokeDevAlarm> queryPageList(SmokeDevAlarm smokeDevAlarm, Integer pageNo, Integer pageSize, HttpServletRequest req);
+
+    CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap<String, Object> paramMap);
 }

src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevAlarmServiceImpl.java

@@ -11,6 +11,7 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator;
 import com.zhgd.xmgl.modules.smoke.entity.AddAlarmDto;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDev;
 import com.zhgd.xmgl.modules.smoke.entity.SmokeDevAlarm;
+import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDevAlarmVo;
 import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevAlarmMapper;
 import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper;
 import com.zhgd.xmgl.modules.smoke.service.ISmokeDevAlarmService;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.HashMap;
 
 /**
  * @Description: 烟感报警数据
@@ -67,4 +69,9 @@ public class SmokeDevAlarmServiceImpl extends ServiceImpl<SmokeDevAlarmMapper, S
         Page<SmokeDevAlarm> page = new Page<SmokeDevAlarm>(pageNo, pageSize);
         return smokeDevAlarmMapper.queryPageList(page, queryWrapper);
     }
+
+    @Override
+    public CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap<String, Object> paramMap) {
+        return baseMapper.countSmokeDevAlarm(paramMap);
+    }
 }