diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } 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 d262559..d6a81e6 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -145,7 +145,7 @@ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } 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 d262559..d6a81e6 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -145,7 +145,7 @@ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ce8a20a..2f28d4a 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -105,7 +105,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } 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 d262559..d6a81e6 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -145,7 +145,7 @@ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ce8a20a..2f28d4a 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -105,7 +105,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/util/ResponseResolver.java b/src/main/java/org/well/well/util/ResponseResolver.java index 91ee40d..7fb9125 100644 --- a/src/main/java/org/well/well/util/ResponseResolver.java +++ b/src/main/java/org/well/well/util/ResponseResolver.java @@ -25,6 +25,7 @@ // abstractResponseHashMap.put(DeviceTypeEnum.TempHumi.name(), new TempHumiResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Dig.name(), new NoiseDigResponse()); abstractResponseHashMap.put(DeviceTypeEnum.NoiseDig.name(), new NoiseDigResponse()); + abstractResponseHashMap.put(DeviceTypeEnum.Noise.name(), new NoiseDigResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Locator.name(), new LocatorResponse()); abstractResponseHashMap.put(DeviceTypeEnum.LG.name(), new LGResponse()); } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } 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 d262559..d6a81e6 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -145,7 +145,7 @@ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ce8a20a..2f28d4a 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -105,7 +105,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/util/ResponseResolver.java b/src/main/java/org/well/well/util/ResponseResolver.java index 91ee40d..7fb9125 100644 --- a/src/main/java/org/well/well/util/ResponseResolver.java +++ b/src/main/java/org/well/well/util/ResponseResolver.java @@ -25,6 +25,7 @@ // abstractResponseHashMap.put(DeviceTypeEnum.TempHumi.name(), new TempHumiResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Dig.name(), new NoiseDigResponse()); abstractResponseHashMap.put(DeviceTypeEnum.NoiseDig.name(), new NoiseDigResponse()); + abstractResponseHashMap.put(DeviceTypeEnum.Noise.name(), new NoiseDigResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Locator.name(), new LocatorResponse()); abstractResponseHashMap.put(DeviceTypeEnum.LG.name(), new LGResponse()); } diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 24a3ae7..59d1d4a 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_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================ @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL= http://139.198.0.132:20010/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL= http://111.198.10.15:11307/job/updateSinkJob +sendURL =http://localhost:11304/job/updateSinkJob diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 006f036..d677171 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -124,7 +124,7 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; - temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019010022\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; + temp="{\"mType\":\"Data\",\"devType\":\"Noise\",\"devCode\":\"212020000a\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 603c0cb..d480000 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -10,6 +10,7 @@ import org.well.well.core.hibernate.HibernateEntityDao; import org.well.well.core.util.DateUtils; import org.well.well.core.util.StringUtils; +import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import org.well.well.dto.LiquidDTO; @@ -152,7 +153,7 @@ alarmContent, level, device, devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob!=null?alarmJob.getId():null, alarmContent,busWell == null ? "" : busWell.getWellCode()); } } 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 d262559..d6a81e6 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -145,7 +145,7 @@ devCode, busWell == null ? "" : busWell.getWellCode(), upTime, alarmContent); // //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob != null ? alarmJob.getId() : null, alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ce8a20a..2f28d4a 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -105,7 +105,7 @@ alarmContent, gas, device, devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 -// ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 diff --git a/src/main/java/org/well/well/util/ResponseResolver.java b/src/main/java/org/well/well/util/ResponseResolver.java index 91ee40d..7fb9125 100644 --- a/src/main/java/org/well/well/util/ResponseResolver.java +++ b/src/main/java/org/well/well/util/ResponseResolver.java @@ -25,6 +25,7 @@ // abstractResponseHashMap.put(DeviceTypeEnum.TempHumi.name(), new TempHumiResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Dig.name(), new NoiseDigResponse()); abstractResponseHashMap.put(DeviceTypeEnum.NoiseDig.name(), new NoiseDigResponse()); + abstractResponseHashMap.put(DeviceTypeEnum.Noise.name(), new NoiseDigResponse()); // abstractResponseHashMap.put(DeviceTypeEnum.Locator.name(), new LocatorResponse()); abstractResponseHashMap.put(DeviceTypeEnum.LG.name(), new LGResponse()); } diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 24a3ae7..59d1d4a 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_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================ @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL= http://139.198.0.132:20010/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL= http://111.198.10.15:11307/job/updateSinkJob +sendURL =http://localhost:11304/job/updateSinkJob diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 24a3ae7..59d1d4a 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_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://192.168.0.212:3306/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=Casic203! +db.default.password=root ### ============================================================================ # dbReal # ============================================================================ @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL= http://139.198.0.132:20010/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL= http://111.198.10.15:11307/job/updateSinkJob +sendURL =http://localhost:11304/job/updateSinkJob