diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 245b30e..d8fdaf4 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.*; /** @@ -69,6 +73,8 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + + if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); @@ -167,5 +173,16 @@ } } } + public boolean isExist(String devcode,String upTime){ + Criteria criteria = getSession().createCriteria(LGLiquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 245b30e..d8fdaf4 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.*; /** @@ -69,6 +73,8 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + + if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); @@ -167,5 +173,16 @@ } } } + public boolean isExist(String devcode,String upTime){ + Criteria criteria = getSession().createCriteria(LGLiquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index d6a81e6..4017a7a 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,7 +19,9 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; import java.text.DecimalFormat; +import java.text.ParseException; import java.util.*; /** @@ -70,7 +74,7 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - + if(isExist(devCode,upTime)) continue;//去重 //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 @@ -193,4 +197,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Liquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 245b30e..d8fdaf4 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.*; /** @@ -69,6 +73,8 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + + if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); @@ -167,5 +173,16 @@ } } } + public boolean isExist(String devcode,String upTime){ + Criteria criteria = getSession().createCriteria(LGLiquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index d6a81e6..4017a7a 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,7 +19,9 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; import java.text.DecimalFormat; +import java.text.ParseException; import java.util.*; /** @@ -70,7 +74,7 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - + if(isExist(devCode,upTime)) continue;//去重 //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 @@ -193,4 +197,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Liquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 2f28d4a..9605d19 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -64,6 +67,7 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -153,4 +157,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Methane.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 245b30e..d8fdaf4 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.*; /** @@ -69,6 +73,8 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + + if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); @@ -167,5 +173,16 @@ } } } + public boolean isExist(String devcode,String upTime){ + Criteria criteria = getSession().createCriteria(LGLiquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index d6a81e6..4017a7a 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,7 +19,9 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; import java.text.DecimalFormat; +import java.text.ParseException; import java.util.*; /** @@ -70,7 +74,7 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - + if(isExist(devCode,upTime)) continue;//去重 //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 @@ -193,4 +197,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Liquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 2f28d4a..9605d19 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -64,6 +67,7 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -153,4 +157,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Methane.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b79c549..2f83956 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -3,6 +3,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -63,6 +67,7 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); //1.清离线 @@ -191,4 +196,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(NoiseDig.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f386176..57808e7 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\":\"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\":\"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}"; @@ -135,15 +135,18 @@ // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20201219150000\"},{\"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\":\"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}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{"mType":"Data","devType":"LG","devCode":"322020080276","mBody":{"cell":96,"datas":[{"gas":0.0,"uptime":"20210610181200"}],"logTime":"20210610180245","bType":"LGData"},"ts":1623319365811}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020030044\",\"mBody\":{\"cell\":49,\"pci\":272,\"rsrp\":-88,\"snr\":25,\"datas\":[{\"gas\":1.8,\"uptime\":\"20210610160600\"},{\"gas\":1.8,\"uptime\":\"20210610170600\"},{\"gas\":1.8,\"uptime\":\"20210610180600\"}],\"logTime\":\"20210610180304\",\"bType\":\"MethaneData\"},\"ts\":1623319384413}"; + +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322020080276\",\"mBody\":{\"cell\":96,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210610181200\"}],\"logTime\":\"20210610180245\",\"bType\":\"LGData\"},\"ts\":1623319365811}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/LGGas.java b/src/main/java/org/well/well/domain/LGGas.java index b3e0f16..eb4d781 100644 --- a/src/main/java/org/well/well/domain/LGGas.java +++ b/src/main/java/org/well/well/domain/LGGas.java @@ -95,6 +95,9 @@ this.logtime = logtime; } + public LGGas() { + } + public LGGas(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; diff --git a/src/main/java/org/well/well/domain/LGLiquid.java b/src/main/java/org/well/well/domain/LGLiquid.java index 4e714ed..67b1243 100644 --- a/src/main/java/org/well/well/domain/LGLiquid.java +++ b/src/main/java/org/well/well/domain/LGLiquid.java @@ -76,4 +76,7 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + public LGLiquid() { + } } diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index 876293e..51ef826 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -106,4 +106,7 @@ public void setSnr(String snr) { this.snr = snr; } + + public Liquid() { + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index 22a7f0c..e06e34c 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -124,7 +124,10 @@ this.snr = snr; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + public Methane() { + } + + public Methane(String devCode, String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 247bc76..8878631 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -135,7 +135,10 @@ this.snr = snr; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + public NoiseDig() { + } + + public NoiseDig(String devId, String wellCode, String cell, Date uptime, String frequency, String dData) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; diff --git a/src/main/java/org/well/well/manager/LGGasManager.java b/src/main/java/org/well/well/manager/LGGasManager.java index 3c8fe61..c4cf7f9 100644 --- a/src/main/java/org/well/well/manager/LGGasManager.java +++ b/src/main/java/org/well/well/manager/LGGasManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,8 +18,10 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service @@ -66,6 +70,7 @@ } String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -168,4 +173,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(LGGas.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index 245b30e..d8fdaf4 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.*; /** @@ -69,6 +73,8 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + + if(isExist(devCode,upTime)) continue;//去重 Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); @@ -167,5 +173,16 @@ } } } + public boolean isExist(String devcode,String upTime){ + Criteria criteria = getSession().createCriteria(LGLiquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index d6a81e6..4017a7a 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,7 +19,9 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; import java.text.DecimalFormat; +import java.text.ParseException; import java.util.*; /** @@ -70,7 +74,7 @@ String level = ((JSONObject) jsonArray.get(i)).get("level").toString(); level = String.format("%.2f", Double.valueOf(level)); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - + if(isExist(devCode,upTime)) continue;//去重 //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 @@ -193,4 +197,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Liquid.class); + criteria.add(Restrictions.eq("devId", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 2f28d4a..9605d19 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -2,6 +2,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import javax.annotation.Resource; import java.io.IOException; import java.sql.Timestamp; +import java.text.ParseException; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -64,6 +67,7 @@ try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); @@ -153,4 +157,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(Methane.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)).getTime())))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b79c549..2f83956 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -3,6 +3,8 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; @@ -17,6 +19,8 @@ import javax.annotation.Resource; import java.io.IOException; import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -63,6 +67,7 @@ String val = ((JSONObject) jsonArray.get(i)).get("noiseVal").toString(); String freq = ((JSONObject) jsonArray.get(i)).get("noiseFreq").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); + if(isExist(devCode,upTime)) continue;//去重 val = String.format("%.2f", Double.valueOf(val)); freq = String.format("%.2f", Double.valueOf(freq)); //1.清离线 @@ -191,4 +196,17 @@ } } } + + public boolean isExist(String devcode,String upTime){ + + Criteria criteria = getSession().createCriteria(NoiseDig.class); + criteria.add(Restrictions.eq("devCode", devcode)); + try { + criteria.add(Restrictions.eq("uptime", DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)))); + } catch (ParseException e) { + e.printStackTrace(); + } + List methaneList = criteria.list(); + return methaneList.size()>0?true:false; + } } diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index abdee1f..37c62a0 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -3,18 +3,23 @@ import net.sf.json.JSONArray; import net.sf.json.JSONObject; +import org.hibernate.Criteria; +import org.hibernate.criterion.Restrictions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.well.well.AlarmEnumDTO.WellAlarmEnum; import org.well.well.base.DeviceTypeEnum; import org.well.well.core.hibernate.HibernateEntityDao; +import org.well.well.core.util.DateUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; import javax.annotation.Resource; import java.io.IOException; +import java.text.ParseException; import java.util.HashMap; +import java.util.List; import java.util.Map; @Service