From 92a350d244cc960b52af55317148a65af33c86c5 Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 23 Jan 2024 10:45:57 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhgd/xmgl/enums/ParamEnum.java | 39 +++++++++++ .../controller/SewageAlarmController.java | 24 +++++++ .../controller/SewageDataController.java | 1 + .../modules/sewage/entity/SewageAlarm.java | 9 +-- .../modules/sewage/entity/SewageData.java | 9 +++ .../sewage/entity/vo/CountSewageAlarmVo.java | 13 ++++ .../sewage/mapper/SewageAlarmMapper.java | 7 ++ .../sewage/mapper/xml/SewageAlarmMapper.xml | 34 ++++++++++ .../sewage/service/ISewageAlarmService.java | 5 ++ .../sewage/service/ISewageDataService.java | 1 + .../service/impl/SewageAlarmServiceImpl.java | 56 ++++++++++++++++ .../service/impl/SewageDataServiceImpl.java | 66 ++++++++++--------- .../java/com/zhgd/xmgl/util/NumberUtils.java | 15 +++++ 13 files changed, 244 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/sewage/entity/vo/CountSewageAlarmVo.java diff --git a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java index 5ae6dbbf3..2007b6893 100644 --- a/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java +++ b/src/main/java/com/zhgd/xmgl/enums/ParamEnum.java @@ -498,5 +498,44 @@ public class ParamEnum { } } + /** + * 污水类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SewageTypeEnum implements BaseEnum { + PH_VALUE(1, "PH值"), + TURBIDITY_VALUE(2, "浊度值"), + CONDUCTIVITY(3, "电导率"), + DISSOLVED_OXYGEN(4, "溶解氧"), + WATER_TEMPERATURE(5, "水温"), + FLOW_RATE(6, "流速"), + WATER_LEVEL(7, "水位"), + ; + + SewageTypeEnum(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/sewage/controller/SewageAlarmController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java index c6c3baf01..0a80bdf64 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageAlarmController.java @@ -1,6 +1,8 @@ package com.zhgd.xmgl.modules.sewage.controller; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; +import com.zhgd.xmgl.modules.sewage.entity.SewageData; +import com.zhgd.xmgl.modules.sewage.entity.vo.CountSewageAlarmVo; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; import io.swagger.annotations.Api; @@ -64,6 +66,7 @@ public class SewageAlarmController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "1今日", paramType = "query", required = false, dataType = "Integer"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { @@ -191,4 +194,25 @@ public class SewageAlarmController { return mv; } + + @ApiOperation(value = "告警数据对比", notes = "告警数据对比", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/waringDataContrast") + public Result waringDataContrast(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(sewageAlarmService.waringDataContrast(paramMap)); + } + + @ApiOperation(value = "实时告警统计", notes = "实时告警统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日", paramType = "body", required = false, dataType = "Integer"), + }) + @PostMapping(value = "/countSewageAlarm") + public Result countSewageAlarm(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(sewageAlarmService.countSewageAlarm(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java index 8a7ac2ef5..650cc60e1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/controller/SewageDataController.java @@ -193,4 +193,5 @@ public class SewageDataController { public Result> countSewageDataTrend(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(sewageDataService.countSewageDataTrend(paramMap)); } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java index 86a86d0be..3b9fa65d8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageAlarm.java @@ -131,13 +131,14 @@ public class SewageAlarm implements Serializable { @ApiModelProperty(value = "报警状态 1预警 2告警") private java.lang.Integer alarmType; + @ApiModelProperty(value = "污水数据id") + private java.lang.Long sewageDataId; + @ApiModelProperty(value = "污水类型") + private java.lang.Integer sewageType; + @TableField(exist = false) @ApiModelProperty(value = "设备名称") private java.lang.String devName; - @TableField(exist = false) - @ApiModelProperty(value = "污水数据id") - private java.lang.Long sewageDataId; - } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java index 70c528791..75fc426eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/SewageData.java @@ -114,4 +114,13 @@ public class SewageData implements Serializable { @ApiModelProperty(value = "是否报警") private java.lang.Boolean isWarning; + @TableField(exist = false) + @ApiModelProperty(value = "电导率（μS/cm）对比报警阈值比率") + private java.lang.Double conductivityRate; + + @TableField(exist = false) + @ApiModelProperty(value = "水温（℃）对比报警阈值比率") + private java.lang.Double waterTemperatureRate; + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/entity/vo/CountSewageAlarmVo.java b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/vo/CountSewageAlarmVo.java new file mode 100644 index 000000000..d5583fc82 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/entity/vo/CountSewageAlarmVo.java @@ -0,0 +1,13 @@ +package com.zhgd.xmgl.modules.sewage.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountSewageAlarmVo { + @ApiModelProperty("今日报警数量") + private Integer alarmNumToday; + @ApiModelProperty("今日预警数量") + private Integer warningNumToday; + +} diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java index 0bb8e8547..5e116d9fe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/SewageAlarmMapper.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.sewage.entity.vo.CountSewageAlarmVo; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; + /** * @Description: 污水预警 * @author： pds @@ -19,4 +22,8 @@ import org.apache.ibatis.annotations.Param; public interface SewageAlarmMapper extends BaseMapper { IPage queryPageList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountSewageAlarmVo countSewageAlarm(HashMap paramMap); + + SewageAlarm getNewestOne(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml index 57c57745b..c8cf4e2ca 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/mapper/xml/SewageAlarmMapper.xml @@ -7,4 +7,38 @@ join sewage_dev sd on sd.dev_sn=sa.dev_sn ${ew.customSqlSegment} + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java index 1cd773884..b348c3714 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageAlarmService.java @@ -3,6 +3,8 @@ package com.zhgd.xmgl.modules.sewage.service; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.sewage.entity.SewageData; +import com.zhgd.xmgl.modules.sewage.entity.vo.CountSewageAlarmVo; import java.util.HashMap; import java.util.List; @@ -19,4 +21,7 @@ public interface ISewageAlarmService extends IService { List queryList(HashMap paramMap); + SewageData waringDataContrast(HashMap paramMap); + + CountSewageAlarmVo countSewageAlarm(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java index 116125b41..73868a4c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/ISewageDataService.java @@ -26,4 +26,5 @@ public interface ISewageDataService extends IService { List countSewageDataTrend(HashMap paramMap); SewageData queryNewestData(HashMap paramMap); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java index 9768eca07..7bd502df1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageAlarmServiceImpl.java @@ -1,19 +1,30 @@ package com.zhgd.xmgl.modules.sewage.service.impl; +import cn.hutool.core.date.DateUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; +import com.zhgd.xmgl.modules.sewage.entity.SewageData; +import com.zhgd.xmgl.modules.sewage.entity.SewageWarnThreshold; +import com.zhgd.xmgl.modules.sewage.entity.vo.CountSewageAlarmVo; import com.zhgd.xmgl.modules.sewage.mapper.SewageAlarmMapper; +import com.zhgd.xmgl.modules.sewage.mapper.SewageWarnThresholdMapper; import com.zhgd.xmgl.modules.sewage.service.ISewageAlarmService; +import com.zhgd.xmgl.util.NumberUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * @Description: 污水预警 @@ -23,6 +34,11 @@ import java.util.List; */ @Service public class SewageAlarmServiceImpl extends ServiceImpl implements ISewageAlarmService { + @Autowired + SewageAlarmMapper sewageAlarmMapper; + @Autowired + SewageWarnThresholdMapper sewageWarnThresholdMapper; + @Override public IPage queryPageList(HashMap paramMap) { QueryWrapper queryWrapper = getQueryWrapper(paramMap); @@ -38,10 +54,50 @@ public class SewageAlarmServiceImpl extends ServiceImpl paramMap) { + String devSn = MapUtils.getString(paramMap, "devSn"); + paramMap.put("sewageType", ParamEnum.SewageTypeEnum.CONDUCTIVITY.getValue()); + SewageAlarm conductivity = sewageAlarmMapper.getNewestOne(paramMap); + paramMap.put("sewageType", ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue()); + SewageAlarm waterTemperature = sewageAlarmMapper.getNewestOne(paramMap); + SewageData data = new SewageData(); + if (conductivity != null) { + data.setConductivity(conductivity.getMonitorValue()); + } + if (waterTemperature != null) { + data.setWaterTemperature(waterTemperature.getMonitorValue()); + } + SewageWarnThreshold threshold = sewageWarnThresholdMapper.selectOne(new LambdaQueryWrapper() + .eq(SewageWarnThreshold::getDevSn, devSn)); + if (threshold != null) { + if (NumberUtils.ge(data.getConductivity(), threshold.getWaterTemperatureHighAlarm())) { + data.setConductivityRate(NumberUtils.rate(data.getConductivity(), threshold.getConductivityHighAlarm(), 2)); + } else if (NumberUtils.le(data.getConductivity(), threshold.getConductivityLowAlarm())) { + data.setConductivityRate(NumberUtils.rate(data.getConductivity(), threshold.getConductivityLowAlarm(), 2)); + } + if (NumberUtils.ge(data.getWaterTemperature(), threshold.getWaterTemperatureHighAlarm())) { + data.setWaterTemperatureRate(NumberUtils.rate(data.getWaterTemperature(), threshold.getWaterTemperatureHighAlarm(), 2)); + } else if (NumberUtils.le(data.getWaterTemperature(), threshold.getWaterTemperatureLowAlarm())) { + data.setWaterTemperatureRate(NumberUtils.rate(data.getWaterTemperature(), threshold.getWaterTemperatureLowAlarm(), 2)); + } + } + return data; + } + + @Override + public CountSewageAlarmVo countSewageAlarm(HashMap paramMap) { + return baseMapper.countSewageAlarm(paramMap); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); String alias = "sa."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SewageAlarm.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(SewageAlarm::getId)); + if (Objects.equals(type, 1)) { + queryWrapper.ge(alias + RefUtil.fieldNameUlc(SewageAlarm::getAlarmTime), DateUtil.today()); + } return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java index 3c3cd0ed4..369bd0b43 100644 --- a/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/sewage/service/impl/SewageDataServiceImpl.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.sewage.service.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -9,6 +8,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.enums.ParamEnum; import com.zhgd.xmgl.modules.sewage.entity.SewageAlarm; import com.zhgd.xmgl.modules.sewage.entity.SewageData; import com.zhgd.xmgl.modules.sewage.entity.SewageDev; @@ -81,37 +81,37 @@ public class SewageDataServiceImpl extends ServiceImpl() .eq(SewageWarnThreshold::getDevSn, dev.getDevSn())); - insertAlarmIfLe(sd.getPhValue(), threshold.getPhValueLowWarn(), dev, "PH值", 1); - insertAlarmIfLe(sd.getTurbidityValue(), threshold.getTurbidityValueLowWarn(), dev, "浊度值", 1); - insertAlarmIfLe(sd.getConductivity(), threshold.getConductivityLowWarn(), dev, "电导率", 1); - insertAlarmIfLe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenLowWarn(), dev, "溶解氧", 1); - insertAlarmIfLe(sd.getWaterTemperature(), threshold.getWaterTemperatureLowWarn(), dev, "水温", 1); - insertAlarmIfLe(sd.getFlowVelocity(), threshold.getFlowVelocityLowWarn(), dev, "流速", 1); - insertAlarmIfLe(sd.getWaterLevel(), threshold.getWaterLevelLowWarn(), dev, "水位", 1); + insertAlarmIfLe(sd.getPhValue(), threshold.getPhValueLowWarn(), dev, ParamEnum.SewageTypeEnum.PH_VALUE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.PH_VALUE.getValue()); + insertAlarmIfLe(sd.getTurbidityValue(), threshold.getTurbidityValueLowWarn(), dev, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getValue()); + insertAlarmIfLe(sd.getConductivity(), threshold.getConductivityLowWarn(), dev, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getValue()); + insertAlarmIfLe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenLowWarn(), dev, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getValue()); + insertAlarmIfLe(sd.getWaterTemperature(), threshold.getWaterTemperatureLowWarn(), dev, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue()); + insertAlarmIfLe(sd.getFlowVelocity(), threshold.getFlowVelocityLowWarn(), dev, ParamEnum.SewageTypeEnum.FLOW_RATE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.FLOW_RATE.getValue()); + insertAlarmIfLe(sd.getWaterLevel(), threshold.getWaterLevelLowWarn(), dev, ParamEnum.SewageTypeEnum.WATER_LEVEL.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.WATER_LEVEL.getValue()); - insertAlarmIfLe(sd.getPhValue(), threshold.getPhValueLowAlarm(), dev, "PH值", 2); - insertAlarmIfLe(sd.getTurbidityValue(), threshold.getTurbidityValueLowAlarm(), dev, "浊度值", 2); - insertAlarmIfLe(sd.getConductivity(), threshold.getConductivityLowAlarm(), dev, "电导率", 2); - insertAlarmIfLe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenLowAlarm(), dev, "溶解氧", 2); - insertAlarmIfLe(sd.getWaterTemperature(), threshold.getWaterTemperatureLowAlarm(), dev, "水温", 2); - insertAlarmIfLe(sd.getFlowVelocity(), threshold.getFlowVelocityLowAlarm(), dev, "流速", 2); - insertAlarmIfLe(sd.getWaterLevel(), threshold.getWaterLevelLowAlarm(), dev, "水位", 2); + insertAlarmIfLe(sd.getPhValue(), threshold.getPhValueLowAlarm(), dev, ParamEnum.SewageTypeEnum.PH_VALUE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.PH_VALUE.getValue()); + insertAlarmIfLe(sd.getTurbidityValue(), threshold.getTurbidityValueLowAlarm(), dev, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getValue()); + insertAlarmIfLe(sd.getConductivity(), threshold.getConductivityLowAlarm(), dev, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getValue()); + insertAlarmIfLe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenLowAlarm(), dev, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getValue()); + insertAlarmIfLe(sd.getWaterTemperature(), threshold.getWaterTemperatureLowAlarm(), dev, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue()); + insertAlarmIfLe(sd.getFlowVelocity(), threshold.getFlowVelocityLowAlarm(), dev, ParamEnum.SewageTypeEnum.FLOW_RATE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.FLOW_RATE.getValue()); + insertAlarmIfLe(sd.getWaterLevel(), threshold.getWaterLevelLowAlarm(), dev, ParamEnum.SewageTypeEnum.WATER_LEVEL.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.WATER_LEVEL.getValue()); - insertAlarmIfGe(sd.getPhValue(), threshold.getPhValueHighWarn(), dev, "PH值", 1); - insertAlarmIfGe(sd.getTurbidityValue(), threshold.getTurbidityValueHighWarn(), dev, "浊度值", 1); - insertAlarmIfGe(sd.getConductivity(), threshold.getConductivityHighWarn(), dev, "电导率", 1); - insertAlarmIfGe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenHighWarn(), dev, "溶解氧", 1); - insertAlarmIfGe(sd.getWaterTemperature(), threshold.getWaterTemperatureHighWarn(), dev, "水温", 1); - insertAlarmIfGe(sd.getFlowVelocity(), threshold.getFlowVelocityHighWarn(), dev, "流速", 1); - insertAlarmIfGe(sd.getWaterLevel(), threshold.getWaterLevelHighWarn(), dev, "水位", 1); + insertAlarmIfGe(sd.getPhValue(), threshold.getPhValueHighWarn(), dev, ParamEnum.SewageTypeEnum.PH_VALUE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.PH_VALUE.getValue()); + insertAlarmIfGe(sd.getTurbidityValue(), threshold.getTurbidityValueHighWarn(), dev, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getValue()); + insertAlarmIfGe(sd.getConductivity(), threshold.getConductivityHighWarn(), dev, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getValue()); + insertAlarmIfGe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenHighWarn(), dev, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getValue()); + insertAlarmIfGe(sd.getWaterTemperature(), threshold.getWaterTemperatureHighWarn(), dev, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue()); + insertAlarmIfGe(sd.getFlowVelocity(), threshold.getFlowVelocityHighWarn(), dev, ParamEnum.SewageTypeEnum.FLOW_RATE.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.FLOW_RATE.getValue()); + insertAlarmIfGe(sd.getWaterLevel(), threshold.getWaterLevelHighWarn(), dev, ParamEnum.SewageTypeEnum.WATER_LEVEL.getDesc(), 1, sd, ParamEnum.SewageTypeEnum.WATER_LEVEL.getValue()); - insertAlarmIfGe(sd.getPhValue(), threshold.getPhValueHighAlarm(), dev, "PH值", 2); - insertAlarmIfGe(sd.getTurbidityValue(), threshold.getTurbidityValueHighAlarm(), dev, "浊度值", 2); - insertAlarmIfGe(sd.getConductivity(), threshold.getConductivityHighAlarm(), dev, "电导率", 2); - insertAlarmIfGe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenHighAlarm(), dev, "溶解氧", 2); - insertAlarmIfGe(sd.getWaterTemperature(), threshold.getWaterTemperatureHighAlarm(), dev, "水温", 2); - insertAlarmIfGe(sd.getFlowVelocity(), threshold.getFlowVelocityHighAlarm(), dev, "流速", 2); - insertAlarmIfGe(sd.getWaterLevel(), threshold.getWaterLevelHighAlarm(), dev, "水位", 2); + insertAlarmIfGe(sd.getPhValue(), threshold.getPhValueHighAlarm(), dev, ParamEnum.SewageTypeEnum.PH_VALUE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.PH_VALUE.getValue()); + insertAlarmIfGe(sd.getTurbidityValue(), threshold.getTurbidityValueHighAlarm(), dev, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.TURBIDITY_VALUE.getValue()); + insertAlarmIfGe(sd.getConductivity(), threshold.getConductivityHighAlarm(), dev, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.CONDUCTIVITY.getValue()); + insertAlarmIfGe(sd.getDissolvedOxygen(), threshold.getDissolvedOxygenHighAlarm(), dev, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.DISSOLVED_OXYGEN.getValue()); + insertAlarmIfGe(sd.getWaterTemperature(), threshold.getWaterTemperatureHighAlarm(), dev, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.WATER_TEMPERATURE.getValue()); + insertAlarmIfGe(sd.getFlowVelocity(), threshold.getFlowVelocityHighAlarm(), dev, ParamEnum.SewageTypeEnum.FLOW_RATE.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.FLOW_RATE.getValue()); + insertAlarmIfGe(sd.getWaterLevel(), threshold.getWaterLevelHighAlarm(), dev, ParamEnum.SewageTypeEnum.WATER_LEVEL.getDesc(), 2, sd, ParamEnum.SewageTypeEnum.WATER_LEVEL.getValue()); } @Override @@ -155,7 +155,7 @@ public class SewageDataServiceImpl extends ServiceImpl