diff --git a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/cable/CableCirculationtemperIncreaseRateServiceImpl.java b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/cable/CableCirculationtemperIncreaseRateServiceImpl.java index e64dad9..7dacf66 100644 --- a/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/cable/CableCirculationtemperIncreaseRateServiceImpl.java +++ b/busi-back/busi-back-serviceImpl/src/main/java/com/huatek/busi/service/impl/cable/CableCirculationtemperIncreaseRateServiceImpl.java @@ -174,7 +174,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu // 保存告警 BusiEqmWarning busiEqmWarning = busiEqmWarningService.saveBusiEqmWarning(equipmentInfoCable, eqType, gzType, - cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate()), "1"); + cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate(), "日"), "1"); // 保存告警详情 BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo(); vo.setMainTreeId(busiCableThreshold.getMainTreeId()); @@ -193,7 +193,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu // 保存告警 BusiEqmWarning busiEqmWarning = busiEqmWarningService.saveBusiEqmWarning(equipmentInfoCable, eqType, gzType, - cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate()), "1"); + cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiCableSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate(), "月"), "1"); // 保存告警详情 BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo(); vo.setMainTreeId(busiCableThreshold.getMainTreeId()); @@ -223,7 +223,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu // 保存告警 BusiEqmWarning busiEqmWarning = busiEqmWarningService.saveBusiEqmWarning(equipmentInfo, eqType, gzType, - cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate()), "1"); + cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getDailyGrowthRate(), "日"), "1"); // 保存告警详情 BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo(); vo.setMainTreeId(busiOtherThreshold.getMainTreeId()); @@ -242,7 +242,7 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu // 保存告警 BusiEqmWarning busiEqmWarning = busiEqmWarningService.saveBusiEqmWarning(equipmentInfo, eqType, gzType, - cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate()), "1"); + cacMonitorTypeCode, day.atStartOfDay(), formateCableWarningMsg(busiOtherSensor.getSensorName(), busiCableCirculationIncreaseRate.getMonthlyGrowthRate(), "月"), "1"); // 保存告警详情 BusiCableCirculationIncreaseRateVo vo = new BusiCableCirculationIncreaseRateVo(); vo.setMainTreeId(busiOtherThreshold.getMainTreeId()); @@ -262,8 +262,8 @@ public class CableCirculationtemperIncreaseRateServiceImpl implements CableCircu return growthRate.compareTo(thresholdValue) > 0; } - private String formateCableWarningMsg(String phase, String tmp) { - return String.format("%s电缆环流:%s%%增长率告警", phase, tmp); + private String formateCableWarningMsg(String sensorName, String growthRate, String type) { + return String.format("%s电缆环流:%s%%%s增长率告警", sensorName, growthRate, type); } // 获取月增长率