diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 7618fa4..0fa82ff 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -63,12 +63,12 @@ save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 60) { + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 35) { alarmContent += "温度超限报警,"; alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 10 || - Float.valueOf(meterMap.get("PH")) <= 6)) { + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 9 || + Float.valueOf(meterMap.get("PH")) <= 6.5)) { alarmContent += "PH值超限报警,"; alarmValue += "PH:" + meterMap.get("PH") + ","; } @@ -77,27 +77,27 @@ alarmContent += "电导率超限报警,"; alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 5) { alarmContent += "溶解氧超限报警,"; alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { - alarmContent += "浊度超限报警,"; - alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; - } +// if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { +// alarmContent += "浊度超限报警,"; +// alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; +// } if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) >= 500) { alarmContent += "化学需氧量超限报警,"; alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 45) { alarmContent += "氨氮超限报警,"; alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 15) { + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 8) { alarmContent += "总磷超限报警,"; alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 30) { + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 70) { alarmContent += "总氮超限报警,"; alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 7618fa4..0fa82ff 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -63,12 +63,12 @@ save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 60) { + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 35) { alarmContent += "温度超限报警,"; alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 10 || - Float.valueOf(meterMap.get("PH")) <= 6)) { + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 9 || + Float.valueOf(meterMap.get("PH")) <= 6.5)) { alarmContent += "PH值超限报警,"; alarmValue += "PH:" + meterMap.get("PH") + ","; } @@ -77,27 +77,27 @@ alarmContent += "电导率超限报警,"; alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 5) { alarmContent += "溶解氧超限报警,"; alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { - alarmContent += "浊度超限报警,"; - alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; - } +// if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { +// alarmContent += "浊度超限报警,"; +// alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; +// } if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) >= 500) { alarmContent += "化学需氧量超限报警,"; alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 45) { alarmContent += "氨氮超限报警,"; alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 15) { + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 8) { alarmContent += "总磷超限报警,"; alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 30) { + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 70) { alarmContent += "总氮超限报警,"; alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 389ee74..0c2d25c 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.166:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================ diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 7618fa4..0fa82ff 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -63,12 +63,12 @@ save(new DataMeter(meterMap, null == busWell ? "" : busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 60) { + if (StringUtils.isNotBlank(meterMap.get("temp")) && Float.valueOf(meterMap.get("temp")) >= 35) { alarmContent += "温度超限报警,"; alarmValue += "温度:" + meterMap.get("temp") + "℃,"; } - if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 10 || - Float.valueOf(meterMap.get("PH")) <= 6)) { + if (StringUtils.isNotBlank(meterMap.get("PH")) && (Float.valueOf(meterMap.get("PH")) >= 9 || + Float.valueOf(meterMap.get("PH")) <= 6.5)) { alarmContent += "PH值超限报警,"; alarmValue += "PH:" + meterMap.get("PH") + ","; } @@ -77,27 +77,27 @@ alarmContent += "电导率超限报警,"; alarmValue += "电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("DO")) && Float.valueOf(meterMap.get("DO")) >= 5) { alarmContent += "溶解氧超限报警,"; alarmValue += "溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { - alarmContent += "浊度超限报警,"; - alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; - } +// if (StringUtils.isNotBlank(meterMap.get("turbidity")) && Float.valueOf(meterMap.get("turbidity")) >= 1000) { +// alarmContent += "浊度超限报警,"; +// alarmValue += "浊度:" + meterMap.get("turbidity") + "NTU,"; +// } if (StringUtils.isNotBlank(meterMap.get("COD")) && Float.valueOf(meterMap.get("COD")) >= 500) { alarmContent += "化学需氧量超限报警,"; alarmValue += "化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 20) { + if (StringUtils.isNotBlank(meterMap.get("AN")) && Float.valueOf(meterMap.get("AN")) >= 45) { alarmContent += "氨氮超限报警,"; alarmValue += "氨氮:" + meterMap.get("AN") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 15) { + if (StringUtils.isNotBlank(meterMap.get("TP")) && Float.valueOf(meterMap.get("TP")) >= 8) { alarmContent += "总磷超限报警,"; alarmValue += "总磷:" + meterMap.get("TP") + "mg/L,"; } - if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 30) { + if (StringUtils.isNotBlank(meterMap.get("TN")) && Float.valueOf(meterMap.get("TN")) >= 70) { alarmContent += "总氮超限报警,"; alarmValue += "总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 389ee74..0c2d25c 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.166:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================ diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 389ee74..0c2d25c 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.166:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================