diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 79eac89..006f036 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -22,12 +22,11 @@ import org.apache.flume.*; import org.apache.flume.conf.Configurable; import org.apache.flume.sink.AbstractSink; -import org.well.well.base.AbstractResponse; -import org.well.well.manager.DeviceManager; -import org.well.well.util.ResponseResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.well.well.base.AbstractResponse; +import org.well.well.util.ResponseResolver; import java.util.List; @@ -54,15 +53,12 @@ super.start(); LOG.info("--------wellMysqlSink start-------"); System.out.println("--------wellMysqlSink start-------"); - - } @Override public void stop() { super.stop(); LOG.info("--------wellMysqlSink stop-------"); - } public Status process() throws EventDeliveryException { @@ -93,7 +89,6 @@ resp.process(temp);//对应的消息处理 LOG.info("--------wellMysqlSink存库处理完！------"); } - } transaction.commit(); } catch (Throwable e) { @@ -125,11 +120,11 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; - temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018040040\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":6.1892,\"uptime\":\"20200925173400\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // 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\":\"612019030052\",\"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\":\"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\":\"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}"; @@ -142,8 +137,8 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312019020253\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200509085400\"},{\"gas\":0.080566406,\"uptime\":\"20200509085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200509085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019060037\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 79eac89..006f036 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -22,12 +22,11 @@ import org.apache.flume.*; import org.apache.flume.conf.Configurable; import org.apache.flume.sink.AbstractSink; -import org.well.well.base.AbstractResponse; -import org.well.well.manager.DeviceManager; -import org.well.well.util.ResponseResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.well.well.base.AbstractResponse; +import org.well.well.util.ResponseResolver; import java.util.List; @@ -54,15 +53,12 @@ super.start(); LOG.info("--------wellMysqlSink start-------"); System.out.println("--------wellMysqlSink start-------"); - - } @Override public void stop() { super.stop(); LOG.info("--------wellMysqlSink stop-------"); - } public Status process() throws EventDeliveryException { @@ -93,7 +89,6 @@ resp.process(temp);//对应的消息处理 LOG.info("--------wellMysqlSink存库处理完！------"); } - } transaction.commit(); } catch (Throwable e) { @@ -125,11 +120,11 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; - temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018040040\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":6.1892,\"uptime\":\"20200925173400\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // 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\":\"612019030052\",\"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\":\"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\":\"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}"; @@ -142,8 +137,8 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312019020253\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200509085400\"},{\"gas\":0.080566406,\"uptime\":\"20200509085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200509085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019060037\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; diff --git a/src/main/java/org/well/well/resp/LiquidResponse.java b/src/main/java/org/well/well/resp/LiquidResponse.java index 7954a5c..5f58e29 100644 --- a/src/main/java/org/well/well/resp/LiquidResponse.java +++ b/src/main/java/org/well/well/resp/LiquidResponse.java @@ -29,9 +29,9 @@ logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------"); JSONObject jsonObject = (JSONObject) json.get("mBody"); if (mType[0].equals(json.get("mType")) || (mType[3].equals(json.get("mType")))) {//处理上报数据 - liquidManager.processNormalData(jsonObject,devCode); + liquidManager.processNormalData(jsonObject, devCode); } else if (mType[1].equals(json.get("mType"))) {//处理报警事件 - liquidManager.processAlarmData(jsonObject,devCode); + liquidManager.processAlarmData(jsonObject, devCode); } else if (mType[2].equals(json.get("mType"))) {//更新下发参数状态 try { if (DeviceTypeEnum.Liquid.name().equals(json.get("devType"))) { diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 79eac89..006f036 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -22,12 +22,11 @@ import org.apache.flume.*; import org.apache.flume.conf.Configurable; import org.apache.flume.sink.AbstractSink; -import org.well.well.base.AbstractResponse; -import org.well.well.manager.DeviceManager; -import org.well.well.util.ResponseResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.well.well.base.AbstractResponse; +import org.well.well.util.ResponseResolver; import java.util.List; @@ -54,15 +53,12 @@ super.start(); LOG.info("--------wellMysqlSink start-------"); System.out.println("--------wellMysqlSink start-------"); - - } @Override public void stop() { super.stop(); LOG.info("--------wellMysqlSink stop-------"); - } public Status process() throws EventDeliveryException { @@ -93,7 +89,6 @@ resp.process(temp);//对应的消息处理 LOG.info("--------wellMysqlSink存库处理完！------"); } - } transaction.commit(); } catch (Throwable e) { @@ -125,11 +120,11 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; - temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018040040\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":6.1892,\"uptime\":\"20200925173400\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // 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\":\"612019030052\",\"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\":\"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\":\"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}"; @@ -142,8 +137,8 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312019020253\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200509085400\"},{\"gas\":0.080566406,\"uptime\":\"20200509085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200509085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019060037\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; diff --git a/src/main/java/org/well/well/resp/LiquidResponse.java b/src/main/java/org/well/well/resp/LiquidResponse.java index 7954a5c..5f58e29 100644 --- a/src/main/java/org/well/well/resp/LiquidResponse.java +++ b/src/main/java/org/well/well/resp/LiquidResponse.java @@ -29,9 +29,9 @@ logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------"); JSONObject jsonObject = (JSONObject) json.get("mBody"); if (mType[0].equals(json.get("mType")) || (mType[3].equals(json.get("mType")))) {//处理上报数据 - liquidManager.processNormalData(jsonObject,devCode); + liquidManager.processNormalData(jsonObject, devCode); } else if (mType[1].equals(json.get("mType"))) {//处理报警事件 - liquidManager.processAlarmData(jsonObject,devCode); + liquidManager.processAlarmData(jsonObject, devCode); } else if (mType[2].equals(json.get("mType"))) {//更新下发参数状态 try { if (DeviceTypeEnum.Liquid.name().equals(json.get("devType"))) { diff --git a/src/main/java/org/well/well/util/ResponseResolver.java b/src/main/java/org/well/well/util/ResponseResolver.java index a1aaa68..91ee40d 100644 --- a/src/main/java/org/well/well/util/ResponseResolver.java +++ b/src/main/java/org/well/well/util/ResponseResolver.java @@ -16,7 +16,6 @@ public class ResponseResolver { private static Map abstractResponseHashMap = new HashMap(); - static { abstractResponseHashMap.put(DeviceTypeEnum.Liquid.name(), new LiquidResponse()); abstractResponseHashMap.put(DeviceTypeEnum.Well.name(), new WellResponse()); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 79eac89..006f036 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -22,12 +22,11 @@ import org.apache.flume.*; import org.apache.flume.conf.Configurable; import org.apache.flume.sink.AbstractSink; -import org.well.well.base.AbstractResponse; -import org.well.well.manager.DeviceManager; -import org.well.well.util.ResponseResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.well.well.base.AbstractResponse; +import org.well.well.util.ResponseResolver; import java.util.List; @@ -54,15 +53,12 @@ super.start(); LOG.info("--------wellMysqlSink start-------"); System.out.println("--------wellMysqlSink start-------"); - - } @Override public void stop() { super.stop(); LOG.info("--------wellMysqlSink stop-------"); - } public Status process() throws EventDeliveryException { @@ -93,7 +89,6 @@ resp.process(temp);//对应的消息处理 LOG.info("--------wellMysqlSink存库处理完！------"); } - } transaction.commit(); } catch (Throwable e) { @@ -125,11 +120,11 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; - temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"112018040040\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":6.1892,\"uptime\":\"20200925173400\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // 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\":\"612019030052\",\"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\":\"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\":\"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}"; @@ -142,8 +137,8 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312019020253\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200509085400\"},{\"gas\":0.080566406,\"uptime\":\"20200509085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200509085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019060037\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312018020163\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200925173900\"},{\"gas\":0.080566406,\"uptime\":\"20200925175400\"},{\"gas\":25,\"uptime\":\"20200925165400\"},{\"gas\":0.09990235,\"uptime\":\"20200925085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200509085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; diff --git a/src/main/java/org/well/well/resp/LiquidResponse.java b/src/main/java/org/well/well/resp/LiquidResponse.java index 7954a5c..5f58e29 100644 --- a/src/main/java/org/well/well/resp/LiquidResponse.java +++ b/src/main/java/org/well/well/resp/LiquidResponse.java @@ -29,9 +29,9 @@ logger.info("--------RECEIVE:设备编号：" + devCode + "，上传数据：" + json.toString() + "-------"); JSONObject jsonObject = (JSONObject) json.get("mBody"); if (mType[0].equals(json.get("mType")) || (mType[3].equals(json.get("mType")))) {//处理上报数据 - liquidManager.processNormalData(jsonObject,devCode); + liquidManager.processNormalData(jsonObject, devCode); } else if (mType[1].equals(json.get("mType"))) {//处理报警事件 - liquidManager.processAlarmData(jsonObject,devCode); + liquidManager.processAlarmData(jsonObject, devCode); } else if (mType[2].equals(json.get("mType"))) {//更新下发参数状态 try { if (DeviceTypeEnum.Liquid.name().equals(json.get("devType"))) { diff --git a/src/main/java/org/well/well/util/ResponseResolver.java b/src/main/java/org/well/well/util/ResponseResolver.java index a1aaa68..91ee40d 100644 --- a/src/main/java/org/well/well/util/ResponseResolver.java +++ b/src/main/java/org/well/well/util/ResponseResolver.java @@ -16,7 +16,6 @@ public class ResponseResolver { private static Map abstractResponseHashMap = new HashMap(); - static { abstractResponseHashMap.put(DeviceTypeEnum.Liquid.name(), new LiquidResponse()); abstractResponseHashMap.put(DeviceTypeEnum.Well.name(), new WellResponse()); diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 0c87ab4..24a3ae7 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://139.198.17.115:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=root +db.default.password=Casic203! ### ============================================================================ # dbReal # ============================================================================ @@ -166,7 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +sendURL= http://139.198.0.132:20010/job/updateSinkJob #sendURL =http://localhost:14537/job/updateSinkJob