diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4e4b394..4ba5d59 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -210,7 +210,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.name(), "%LEL"); + WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } } else {//未超限 diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4e4b394..4ba5d59 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -210,7 +210,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.name(), "%LEL"); + WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index f2ef063..3f8d588 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -121,7 +121,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), - WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.name(), ""); + WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } } diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4e4b394..4ba5d59 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -210,7 +210,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.name(), "%LEL"); + WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index f2ef063..3f8d588 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -121,7 +121,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), - WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.name(), ""); + WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index f268cad..2bcfb8e 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -30,10 +30,12 @@ JSONArray msglist = new JSONArray(); JSONObject msgMap = new JSONObject(); msgMap.put("time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - msgMap.put("devcode", devcode+"("+deviceType+")"); + msgMap.put("devcode", devcode); msgMap.put("value", value+units); + msgMap.put("position", position); msgMap.put("content", alarmContent); String phoneJson = ""; + List aliSignNameList = new ArrayList<>(); String aliSignName = Configure.getProperty("aliSignNameJson", ""); String[] phones = tel.split(","); diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4e4b394..4ba5d59 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -210,7 +210,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.name(), "%LEL"); + WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index f2ef063..3f8d588 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -121,7 +121,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), - WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.name(), ""); + WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index f268cad..2bcfb8e 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -30,10 +30,12 @@ JSONArray msglist = new JSONArray(); JSONObject msgMap = new JSONObject(); msgMap.put("time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - msgMap.put("devcode", devcode+"("+deviceType+")"); + msgMap.put("devcode", devcode); msgMap.put("value", value+units); + msgMap.put("position", position); msgMap.put("content", alarmContent); String phoneJson = ""; + List aliSignNameList = new ArrayList<>(); String aliSignName = Configure.getProperty("aliSignNameJson", ""); String[] phones = tel.split(","); diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 2667ad1..e2da687 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -26,12 +26,17 @@ } public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; + try { + String value = new String(properties.getProperty(key).getBytes("ISO-8859-1"), "utf-8"); + if (null == value) { + return defaultValue; + } else { + return value; + } + }catch (Exception ex){ + ex.printStackTrace(); } + return defaultValue; } public static Object setProperty(String key, String value) { @@ -46,22 +51,22 @@ try { Date time = new SimpleDateFormat("yyyyMMdd"). parse("20220905"); - System.out.println("09-05-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-05-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220912"); - System.out.println("09-12-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-12-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220919"); - System.out.println("09-19-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-19-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220926"); - System.out.println("09-26-"+time.getTime()); + System.out.println("09-26-" + time.getTime()); time = new SimpleDateFormat("yyyyMMdd"). parse("20221003"); - System.out.println("10-03-"+time.getTime()); + System.out.println("10-03-" + time.getTime()); time = new SimpleDateFormat("yyyyMMdd"). parse("20221010"); - System.out.println("10-10-"+time.getTime()); + System.out.println("10-10-" + time.getTime()); } catch (Exception e) { diff --git a/src/main/java/org/well/well/base/DeviceTypeEnum.java b/src/main/java/org/well/well/base/DeviceTypeEnum.java index d570944..10f40fb 100644 --- a/src/main/java/org/well/well/base/DeviceTypeEnum.java +++ b/src/main/java/org/well/well/base/DeviceTypeEnum.java @@ -43,4 +43,6 @@ public String toString() { return this.name; } + + } \ No newline at end of file diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index acb2e0d..8f05b67 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -129,7 +129,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),gas, busWell.getPosition(), - alarmContent,DeviceTypeEnum.LG.name(),"%LEL"); + alarmContent,DeviceTypeEnum.LG.toString(),"%LEL"); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index acf7672..0986009 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -150,7 +150,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), level, busWell.getPosition(), - alarmContent, DeviceTypeEnum.LG.name(), ""); + alarmContent, DeviceTypeEnum.LG.toString(), ""); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index be4ad39..1f35bf7 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -143,7 +143,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),level, busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Liquid.toString(),""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index d2c8395..c4c2b7f 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -105,7 +105,7 @@ //配置了手机号，可以走短信平台发送 if(!StringUtils.isEmpty(busWell.getTel())){ AlarmPushProvider.alarmPushBuilder(devCode,busWell.getTel(),alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent,DeviceTypeEnum.Liquid.name(),""); + alarmContent,DeviceTypeEnum.Meter.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 5531f86..7cf4eff 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -133,7 +133,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), gas, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Methane.name(), ""); + alarmContent, DeviceTypeEnum.Methane.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index ad187bc..662b300 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -134,7 +134,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.NoiseDig.name(), ""); + alarmContent, DeviceTypeEnum.NoiseDig.toString(), ""); } } diff --git a/src/main/java/org/well/well/manager/NoiseManager.java b/src/main/java/org/well/well/manager/NoiseManager.java index c235598..547ab2e 100644 --- a/src/main/java/org/well/well/manager/NoiseManager.java +++ b/src/main/java/org/well/well/manager/NoiseManager.java @@ -127,7 +127,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), val, busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 50cdb32..afde01d 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -163,7 +163,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - alarmContent, DeviceTypeEnum.Noise.name(), ""); + alarmContent, DeviceTypeEnum.Noise.toString(), ""); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/TubeManager.java b/src/main/java/org/well/well/manager/TubeManager.java index 3b5c61d..4002c1d 100644 --- a/src/main/java/org/well/well/manager/TubeManager.java +++ b/src/main/java/org/well/well/manager/TubeManager.java @@ -126,7 +126,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),gas,busWell.getPosition(), - alarmContent, DeviceTypeEnum.Tube.name(), ""); + alarmContent, DeviceTypeEnum.Tube.toString(), ""); } } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 4e4b394..4ba5d59 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -210,7 +210,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(), alarmValue.substring(0, alarmValue.length() - 1), busWell.getPosition(), - WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.name(), "%LEL"); + WasteGasAlarmEnum.OVER_THRESH.getName(), DeviceTypeEnum.WasteGas.toString(), "%LEL"); } } } else {//未超限 diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index f2ef063..3f8d588 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -121,7 +121,7 @@ //配置了手机号，可以走短信平台发送 if (!StringUtils.isEmpty(busWell.getTel())) { AlarmPushProvider.alarmPushBuilder(devCode, busWell.getTel(),"", busWell.getPosition(), - WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.name(), ""); + WellAlarmEnum.WellOpenAlarm.name(), DeviceTypeEnum.Well.toString(), ""); } } } diff --git a/src/main/java/org/well/well/util/AlarmPushProvider.java b/src/main/java/org/well/well/util/AlarmPushProvider.java index f268cad..2bcfb8e 100644 --- a/src/main/java/org/well/well/util/AlarmPushProvider.java +++ b/src/main/java/org/well/well/util/AlarmPushProvider.java @@ -30,10 +30,12 @@ JSONArray msglist = new JSONArray(); JSONObject msgMap = new JSONObject(); msgMap.put("time", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); - msgMap.put("devcode", devcode+"("+deviceType+")"); + msgMap.put("devcode", devcode); msgMap.put("value", value+units); + msgMap.put("position", position); msgMap.put("content", alarmContent); String phoneJson = ""; + List aliSignNameList = new ArrayList<>(); String aliSignName = Configure.getProperty("aliSignNameJson", ""); String[] phones = tel.split(","); diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 2667ad1..e2da687 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -26,12 +26,17 @@ } public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; + try { + String value = new String(properties.getProperty(key).getBytes("ISO-8859-1"), "utf-8"); + if (null == value) { + return defaultValue; + } else { + return value; + } + }catch (Exception ex){ + ex.printStackTrace(); } + return defaultValue; } public static Object setProperty(String key, String value) { @@ -46,22 +51,22 @@ try { Date time = new SimpleDateFormat("yyyyMMdd"). parse("20220905"); - System.out.println("09-05-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-05-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220912"); - System.out.println("09-12-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-12-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220919"); - System.out.println("09-19-"+time.getTime()); - time = new SimpleDateFormat("yyyyMMdd"). + System.out.println("09-19-" + time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). parse("20220926"); - System.out.println("09-26-"+time.getTime()); + System.out.println("09-26-" + time.getTime()); time = new SimpleDateFormat("yyyyMMdd"). parse("20221003"); - System.out.println("10-03-"+time.getTime()); + System.out.println("10-03-" + time.getTime()); time = new SimpleDateFormat("yyyyMMdd"). parse("20221010"); - System.out.println("10-10-"+time.getTime()); + System.out.println("10-10-" + time.getTime()); } catch (Exception e) { diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index b614fc0..b3946b0 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -187,7 +187,7 @@ aliKey = LTAI5tDFNucQF2Bdy4fHgzrN aliSecret= hZ22QQPxQue1G0R8Ty2bo6GimrLdoB aliUrl = dysmsapi.aliyuncs.com -aliSignNameJson= 柴壮告警提醒 -aliTemplateCode= SMS_268475055 +aliSignNameJson = 柴壮告警提醒 +aliTemplateCode= SMS_273775754