From 1dc74e5d862e4f76b0b06105907bd9d1f8a4241d Mon Sep 17 00:00:00 2001 From: guo Date: Thu, 11 Jan 2024 10:38:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/enums/ParamEnum.java | 37 +++++++++++++++++++ .../PoisonousGasDevAlarmController.java | 14 +++++++ .../PoisonousGasDevCurrentDataController.java | 13 +++++++ .../entity/PoisonousGasDevAlarm.java | 3 +- .../mapper/PoisonousGasDevAlarmMapper.java | 6 +++ .../PoisonousGasDevCurrentDataMapper.java | 4 ++ .../mapper/xml/PoisonousGasDevAlarmMapper.xml | 21 +++++++++++ .../xml/PoisonousGasDevCurrentDataMapper.xml | 16 ++++++++ .../service/IPoisonousGasDevAlarmService.java | 4 ++ .../IPoisonousGasDevCurrentDataService.java | 4 ++ .../impl/PoisonousGasDevAlarmServiceImpl.java | 11 ++++++ ...PoisonousGasDevCurrentDataServiceImpl.java | 25 ++++++++++--- .../controller/SmokeDevAlarmController.java | 14 +++++++ .../smoke/entity/vo/CountSmokeDevAlarmVo.java | 14 +++++++ .../smoke/mapper/SmokeDevAlarmMapper.java | 5 +++ .../smoke/mapper/xml/SmokeDevAlarmMapper.xml | 12 ++++++ .../smoke/service/ISmokeDevAlarmService.java | 4 ++ .../impl/SmokeDevAlarmServiceImpl.java | 7 ++++ 18 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDevAlarmVo.java diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index 0fea66773..9dd432606 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/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; + } + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevAlarmController.java index a91ae54df..c20d8c79a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevAlarmController.java +++ b/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 countPoisonousGasDevAlarmGasType(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(poisonousGasDevAlarmService.countPoisonousGasDevAlarmGasType(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevCurrentDataController.java index b00b3c01d..5114042da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/controller/PoisonousGasDevCurrentDataController.java +++ b/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> countPoisonousGasDevCurrentDataGasType(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(poisonousGasDevCurrentDataService.countPoisonousGasDevCurrentDataGasType(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDevAlarm.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDevAlarm.java index d9a3081a8..187107919 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/entity/PoisonousGasDevAlarm.java +++ b/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) diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevAlarmMapper.java index 0f5be0085..380f0e7d6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevAlarmMapper.java +++ b/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 { IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List countPoisonousGasDevAlarmGasType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevCurrentDataMapper.java index 23e7b7601..351d9fef1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/PoisonousGasDevCurrentDataMapper.java +++ b/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 queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List countPoisonousGasDevCurrentDataGasType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml index 55e25c822..cb141e1a8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevAlarmMapper.xml +++ b/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} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevCurrentDataMapper.xml index eba113c72..e9e431678 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/poisonous/mapper/xml/PoisonousGasDevCurrentDataMapper.xml @@ -28,4 +28,20 @@ pgd.dev_sn=pgdcd.dev_sn ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevAlarmService.java index 269decf0c..44466c635 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevAlarmService.java +++ b/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 { IPage queryPageList(PoisonousGasDevAlarm poisonousGasDevAlarm, Integer pageNo, Integer pageSize, HttpServletRequest req); + + SectorVo countPoisonousGasDevAlarmGasType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevCurrentDataService.java index 0de462f88..3cfbbab46 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/IPoisonousGasDevCurrentDataService.java +++ b/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 countPoisonousGasDevCurrentDataGasType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java index 90f937562..e84062b84 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevAlarmServiceImpl.java +++ b/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 page = new Page(pageNo, pageSize); return poisonousGasDevAlarmMapper.queryPageList(page, queryWrapper); } + + @Override + public SectorVo countPoisonousGasDevAlarmGasType(HashMap paramMap) { + List list = baseMapper.countPoisonousGasDevAlarmGasType(paramMap); + return SectorVo.getSectorVoByEnum(list, ParamEnum.PoisonousGasDevAlarmGasTypeEnum.values()); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevCurrentDataServiceImpl.java index 484fb5dee..6ad50d2de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/poisonous/service/impl/PoisonousGasDevCurrentDataServiceImpl.java +++ b/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 countPoisonousGasDevCurrentDataGasType(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); + if (Objects.equals(type, 1)) { + List 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 countSmokeDevAlarm(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(smokeDevAlarmService.countSmokeDevAlarm(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDevAlarmVo.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDevAlarmVo.java new file mode 100644 index 000000000..037e14e81 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevAlarmMapper.java index 607421460..b4c96047f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevAlarmMapper.java +++ b/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 { IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml index a91c117bc..74d902437 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevAlarmMapper.xml +++ b/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} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevAlarmService.java index 4ef4b2349..e3b1ed218 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevAlarmService.java +++ b/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 { String addAlarm(AddAlarmDto dto); IPage queryPageList(SmokeDevAlarm smokeDevAlarm, Integer pageNo, Integer pageSize, HttpServletRequest req); + + CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap 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 141565e6e..2b2159392 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 @@ -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 page = new Page(pageNo, pageSize); return smokeDevAlarmMapper.queryPageList(page, queryWrapper); } + + @Override + public CountSmokeDevAlarmVo countSmokeDevAlarm(HashMap paramMap) { + return baseMapper.countSmokeDevAlarm(paramMap); + } }