diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 836bb9c..3b50bcb 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -41,13 +41,14 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String address, String wellCode, - String strength, String cell, String uptime) { + String strength, String cell, String uptime, + String pci, String rsrp, String snr) { Map resultMap = new HashMap(); try { Methane methane = new Methane(address, wellCode, strength, cell, new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)).getTime())), - new Timestamp((new Date()).getTime())); + new Timestamp((new Date()).getTime()),pci,rsrp,snr); save(methane); } catch (Exception e) { e.printStackTrace(); @@ -58,19 +59,22 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : ""; + String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : ""; + String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : ""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - gas=String.format("%.2f", Double.valueOf(gas)); + gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr);//存储采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 @@ -90,20 +94,20 @@ //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); //2.写入新的告警记录,工单号为上一条告警记录的工单号 - alarmRecordManager.saveData(alarmRecord.getJobId(), "1",alarmLevel, alarmContent, - gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime,alarmContent); + alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmLevel, alarmContent, + gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent); } else {//不存在上一条报警时 Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "1"); //2.写入新的告警 - alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, + alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, alarmContent, gas, device, - devCode, alarmJob.getWellCode(), upTime,alarmContent); + devCode, alarmJob.getWellCode(), upTime, alarmContent); //3.toDo:向app推送报警消息 - ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 @@ -134,12 +138,12 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "0"); } - alarmRecordManager.saveData(alarmJob.getId(), "2",null, + alarmRecordManager.saveData(alarmJob.getId(), "2", null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), String.valueOf(MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getIndex()), device, devCode, null != busWell ? busWell.getWellCode() : "", logTime, diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 836bb9c..3b50bcb 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -41,13 +41,14 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String address, String wellCode, - String strength, String cell, String uptime) { + String strength, String cell, String uptime, + String pci, String rsrp, String snr) { Map resultMap = new HashMap(); try { Methane methane = new Methane(address, wellCode, strength, cell, new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)).getTime())), - new Timestamp((new Date()).getTime())); + new Timestamp((new Date()).getTime()),pci,rsrp,snr); save(methane); } catch (Exception e) { e.printStackTrace(); @@ -58,19 +59,22 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : ""; + String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : ""; + String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : ""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - gas=String.format("%.2f", Double.valueOf(gas)); + gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr);//存储采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 @@ -90,20 +94,20 @@ //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); //2.写入新的告警记录,工单号为上一条告警记录的工单号 - alarmRecordManager.saveData(alarmRecord.getJobId(), "1",alarmLevel, alarmContent, - gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime,alarmContent); + alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmLevel, alarmContent, + gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent); } else {//不存在上一条报警时 Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "1"); //2.写入新的告警 - alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, + alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, alarmContent, gas, device, - devCode, alarmJob.getWellCode(), upTime,alarmContent); + devCode, alarmJob.getWellCode(), upTime, alarmContent); //3.toDo:向app推送报警消息 - ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 @@ -134,12 +138,12 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "0"); } - alarmRecordManager.saveData(alarmJob.getId(), "2",null, + alarmRecordManager.saveData(alarmJob.getId(), "2", null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), String.valueOf(MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getIndex()), device, devCode, null != busWell ? busWell.getWellCode() : "", logTime, diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8eafa1c..6cc0619 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -40,13 +40,14 @@ // private static final double constant=0.0153; public Map saveData(String devId, String wellCode, String cell, String uptime, - String frequency, String dData) throws IOException { + String frequency, String dData, + String pci,String rsrp,String snr) throws IOException { Map resultMap = new HashMap(); try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData); + frequency, dData,pci,rsrp,snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -56,6 +57,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -70,7 +74,7 @@ //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 836bb9c..3b50bcb 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -41,13 +41,14 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String address, String wellCode, - String strength, String cell, String uptime) { + String strength, String cell, String uptime, + String pci, String rsrp, String snr) { Map resultMap = new HashMap(); try { Methane methane = new Methane(address, wellCode, strength, cell, new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)).getTime())), - new Timestamp((new Date()).getTime())); + new Timestamp((new Date()).getTime()),pci,rsrp,snr); save(methane); } catch (Exception e) { e.printStackTrace(); @@ -58,19 +59,22 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : ""; + String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : ""; + String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : ""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - gas=String.format("%.2f", Double.valueOf(gas)); + gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr);//存储采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 @@ -90,20 +94,20 @@ //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); //2.写入新的告警记录,工单号为上一条告警记录的工单号 - alarmRecordManager.saveData(alarmRecord.getJobId(), "1",alarmLevel, alarmContent, - gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime,alarmContent); + alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmLevel, alarmContent, + gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent); } else {//不存在上一条报警时 Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "1"); //2.写入新的告警 - alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, + alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, alarmContent, gas, device, - devCode, alarmJob.getWellCode(), upTime,alarmContent); + devCode, alarmJob.getWellCode(), upTime, alarmContent); //3.toDo:向app推送报警消息 - ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 @@ -134,12 +138,12 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "0"); } - alarmRecordManager.saveData(alarmJob.getId(), "2",null, + alarmRecordManager.saveData(alarmJob.getId(), "2", null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), String.valueOf(MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getIndex()), device, devCode, null != busWell ? busWell.getWellCode() : "", logTime, diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8eafa1c..6cc0619 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -40,13 +40,14 @@ // private static final double constant=0.0153; public Map saveData(String devId, String wellCode, String cell, String uptime, - String frequency, String dData) throws IOException { + String frequency, String dData, + String pci,String rsrp,String snr) throws IOException { Map resultMap = new HashMap(); try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData); + frequency, dData,pci,rsrp,snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -56,6 +57,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -70,7 +74,7 @@ //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 99a28e9..d84dcc7 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -43,14 +43,14 @@ private static String[] nameArr = {"温度", "湿度"}; public Map saveData(String devCode, String wellCode,String upTime, - String temperature, String humidity, String cell) { + String temperature, String humidity, String cell, + String pci,String rsrp,String snr) { Map resultMap = new HashMap(); try { TempHumi tempHumi = new TempHumi(devCode, wellCode, DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)), - - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); save(tempHumi); } catch (Exception e) { e.printStackTrace(); @@ -61,6 +61,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { @@ -76,7 +79,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), upTime, - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; if (busWell != null) {//获取不到相关联的井，就无法获取告警规则，故不存库 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 836bb9c..3b50bcb 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -41,13 +41,14 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String address, String wellCode, - String strength, String cell, String uptime) { + String strength, String cell, String uptime, + String pci, String rsrp, String snr) { Map resultMap = new HashMap(); try { Methane methane = new Methane(address, wellCode, strength, cell, new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)).getTime())), - new Timestamp((new Date()).getTime())); + new Timestamp((new Date()).getTime()),pci,rsrp,snr); save(methane); } catch (Exception e) { e.printStackTrace(); @@ -58,19 +59,22 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : ""; + String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : ""; + String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : ""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - gas=String.format("%.2f", Double.valueOf(gas)); + gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr);//存储采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 @@ -90,20 +94,20 @@ //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); //2.写入新的告警记录,工单号为上一条告警记录的工单号 - alarmRecordManager.saveData(alarmRecord.getJobId(), "1",alarmLevel, alarmContent, - gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime,alarmContent); + alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmLevel, alarmContent, + gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent); } else {//不存在上一条报警时 Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "1"); //2.写入新的告警 - alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, + alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, alarmContent, gas, device, - devCode, alarmJob.getWellCode(), upTime,alarmContent); + devCode, alarmJob.getWellCode(), upTime, alarmContent); //3.toDo:向app推送报警消息 - ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 @@ -134,12 +138,12 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "0"); } - alarmRecordManager.saveData(alarmJob.getId(), "2",null, + alarmRecordManager.saveData(alarmJob.getId(), "2", null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), String.valueOf(MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getIndex()), device, devCode, null != busWell ? busWell.getWellCode() : "", logTime, diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8eafa1c..6cc0619 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -40,13 +40,14 @@ // private static final double constant=0.0153; public Map saveData(String devId, String wellCode, String cell, String uptime, - String frequency, String dData) throws IOException { + String frequency, String dData, + String pci,String rsrp,String snr) throws IOException { Map resultMap = new HashMap(); try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData); + frequency, dData,pci,rsrp,snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -56,6 +57,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -70,7 +74,7 @@ //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 99a28e9..d84dcc7 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -43,14 +43,14 @@ private static String[] nameArr = {"温度", "湿度"}; public Map saveData(String devCode, String wellCode,String upTime, - String temperature, String humidity, String cell) { + String temperature, String humidity, String cell, + String pci,String rsrp,String snr) { Map resultMap = new HashMap(); try { TempHumi tempHumi = new TempHumi(devCode, wellCode, DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)), - - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); save(tempHumi); } catch (Exception e) { e.printStackTrace(); @@ -61,6 +61,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { @@ -76,7 +79,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), upTime, - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; if (busWell != null) {//获取不到相关联的井，就无法获取告警规则，故不存库 diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 68b9e28..2e24ea6 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,7 +20,7 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=Casic203! ### ============================================================================ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 2762017..0802335 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,19 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"612019030052\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":1000.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20200407091300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20200407091300\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20200407091300\"},{\"noiseVal\":1000,\"noiseFreq\":1545,\"uptime\":\"20200407091300\"}],\"logTime\":\"20200407091300\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"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\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; // 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\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"pci\":100,\"rsrp\":50,\"snr\":20,\"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\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; - temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"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}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); diff --git a/src/main/java/org/well/well/domain/Liquid.java b/src/main/java/org/well/well/domain/Liquid.java index b52f4a6..f497a15 100644 --- a/src/main/java/org/well/well/domain/Liquid.java +++ b/src/main/java/org/well/well/domain/Liquid.java @@ -18,6 +18,9 @@ private String cell; private Date uptime; private Date logtime; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -76,4 +79,31 @@ public void setWellCode(String wellCode) { this.wellCode = wellCode; } + + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } } diff --git a/src/main/java/org/well/well/domain/Methane.java b/src/main/java/org/well/well/domain/Methane.java index f33446c..93515ff 100644 --- a/src/main/java/org/well/well/domain/Methane.java +++ b/src/main/java/org/well/well/domain/Methane.java @@ -19,7 +19,9 @@ private String descn; //状态描述 private Timestamp uptime; //采集时间 private Timestamp logtime; //记录时间 - + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -95,12 +97,44 @@ this.logtime = logtime; } - public Methane(String devCode,String wellCode, String strength, String cell, Timestamp uptime, Timestamp logtime) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public Methane(String devCode,String wellCode, String strength, String cell, + Timestamp uptime, Timestamp logtime, + String pci,String rsrp,String snr) { this.devCode = devCode; this.wellCode=wellCode; this.strength = strength; this.cell = cell; this.uptime = uptime; this.logtime = logtime; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/domain/NoiseDig.java b/src/main/java/org/well/well/domain/NoiseDig.java index 467ca8b..20da5c6 100644 --- a/src/main/java/org/well/well/domain/NoiseDig.java +++ b/src/main/java/org/well/well/domain/NoiseDig.java @@ -8,87 +8,89 @@ @Entity @Table(name = "data_dig") public class NoiseDig implements Serializable { - /** - * - */ - private static final long serialVersionUID = 566089135526318711L; - private Long dbId; - private String devCode; //设备编号 - private String wellCode; //井编号 - private String dData; //噪声值 - private String frequency; //频率 - private String cell; //电池电量 - private String descn; //状态描述 - private Date uptime; //采集时间 - private Date logtime; //记录时间 + /** + * + */ + private static final long serialVersionUID = 566089135526318711L; + private Long dbId; + private String devCode; //设备编号 + private String wellCode; //井编号 + private String dData; //噪声值 + private String frequency; //频率 + private String cell; //电池电量 + private String descn; //状态描述 + private Date uptime; //采集时间 + private Date logtime; //记录时间 + private String pci; + private String rsrp; + private String snr; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "ID") + public Long getDbId() { + return dbId; + } - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "ID") - public Long getDbId() { - return dbId; - } + public void setDbId(Long dbId) { + this.dbId = dbId; + } - public void setDbId(Long dbId) { - this.dbId = dbId; - } + @Column(name = "DDATA") + public String getdData() { + return dData; + } - @Column(name = "DDATA") - public String getdData() { - return dData; - } + public void setdData(String dData) { + this.dData = dData; + } - public void setdData(String dData) { - this.dData = dData; - } + @Column(name = "FREQUENCY") + public String getFrequency() { + return frequency; + } - @Column(name = "FREQUENCY") - public String getFrequency() { - return frequency; - } + public void setFrequency(String frequency) { + this.frequency = frequency; + } - public void setFrequency(String frequency) { - this.frequency = frequency; - } + @Column(name = "DEVCODE") + public String getDevCode() { + return devCode; + } - @Column(name = "DEVCODE") - public String getDevCode() { - return devCode; - } + public void setDevCode(String devCode) { + this.devCode = devCode; + } - public void setDevCode(String devCode) { - this.devCode = devCode; - } + @Column(name = "WELL_CODE") + public String getWellCode() { + return wellCode; + } - @Column(name = "WELL_CODE") - public String getWellCode() { - return wellCode; - } + public void setWellCode(String wellCode) { + this.wellCode = wellCode; + } - public void setWellCode(String wellCode) { - this.wellCode = wellCode; - } + @Column(name = "DESCN") + public String getDescn() { + return descn; + } - @Column(name = "DESCN") - public String getDescn() { - return descn; - } + public void setDescn(String descn) { + this.descn = descn; + } - public void setDescn(String descn) { - this.descn = descn; - } + @Column(name = "CELL") + public String getCell() { + return cell; + } - @Column(name = "CELL") - public String getCell() { - return cell; - } + public void setCell(String cell) { + this.cell = cell; + } - public void setCell(String cell) { - this.cell = cell; - } - - @Column(name = "UPTIME") + @Column(name = "UPTIME") public Date getUptime() { return uptime; } @@ -106,7 +108,36 @@ this.logtime = logtime; } - public NoiseDig(String devId, String wellCode,String cell, Date uptime, String frequency, String dData) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public NoiseDig(String devId, String wellCode, String cell, + Date uptime, String frequency, String dData, + String pci, String rsrp, String snr) { this.devCode = devId; this.wellCode = wellCode; this.cell = cell; @@ -114,5 +145,8 @@ this.logtime = new Date(); this.frequency = frequency; this.dData = dData; + this.pci = pci; + this.rsrp = rsrp; + this.snr = snr; } } diff --git a/src/main/java/org/well/well/domain/TempHumi.java b/src/main/java/org/well/well/domain/TempHumi.java index 9d9eff4..68eb46d 100644 --- a/src/main/java/org/well/well/domain/TempHumi.java +++ b/src/main/java/org/well/well/domain/TempHumi.java @@ -6,33 +6,34 @@ @Entity @Table(name = "data_temp_hum") -public class TempHumi implements Serializable -{ - /** - * - */ - private static final long serialVersionUID = 1L; - private long id; - private String devCode; - private String wellCode; - private Date upTime; +public class TempHumi implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + private long id; + private String devCode; + private String wellCode; + private Date upTime; private Date logTime; - private String temperature; - private String humidity; - private String descn; - private String cell; + private String temperature; + private String humidity; + private String descn; + private String cell; + private String pci; + private String rsrp; + private String snr; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID") - public long getId() - { - return id; - } - public void setId(long id) - { - this.id = id; - } + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } @Column(name = "DEVCODE") public String getDevCode() { @@ -42,20 +43,21 @@ public void setDevCode(String devCode) { this.devCode = devCode; } + @Column(name = "UPTIME") - public Date getUpTime() - { - return upTime; - } - public void setUpTime(Date upTime) - { - this.upTime = upTime; - } + public Date getUpTime() { + return upTime; + } + + public void setUpTime(Date upTime) { + this.upTime = upTime; + } @Column(name = "LOGTIME") public Date getLogTime() { return logTime; } + public void setLogTime(Date logTime) { this.logTime = logTime; } @@ -105,8 +107,36 @@ this.wellCode = wellCode; } - public TempHumi(String devCode, String wellCode,Date upTime, - String temperature, String humidity, String cell) { + @Column(name = "PCI") + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + @Column(name = "RSRP") + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + @Column(name = "SNR") + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public TempHumi(String devCode, String wellCode, Date upTime, + String temperature, String humidity, String cell, + String pci, String rsrp, String snr) { this.devCode = devCode; this.wellCode = wellCode; this.upTime = upTime; @@ -114,5 +144,8 @@ this.humidity = humidity; this.cell = cell; this.logTime = new Date(); + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/dto/LiquidDTO.java b/src/main/java/org/well/well/dto/LiquidDTO.java index 83f2ce2..be74271 100644 --- a/src/main/java/org/well/well/dto/LiquidDTO.java +++ b/src/main/java/org/well/well/dto/LiquidDTO.java @@ -11,7 +11,9 @@ private String logTime; private String uptime; private String descn; - + private String pci; + private String rsrp; + private String snr; public String getLiquidData() { return liquidData; @@ -53,11 +55,38 @@ this.descn = descn; } - public LiquidDTO(String liquidData, String cell, String uptime, String devCode,String wellCode) { + public String getPci() { + return pci; + } + + public void setPci(String pci) { + this.pci = pci; + } + + public String getRsrp() { + return rsrp; + } + + public void setRsrp(String rsrp) { + this.rsrp = rsrp; + } + + public String getSnr() { + return snr; + } + + public void setSnr(String snr) { + this.snr = snr; + } + + public LiquidDTO(String liquidData, String cell, String uptime, String devCode, String wellCode, String pci, String rsrp, String snr) { this.liquidData = liquidData; this.cell = cell; this.uptime = uptime; this.devCode = devCode; this.wellCode = wellCode; + this.pci=pci; + this.rsrp=rsrp; + this.snr=snr; } } diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 67837f4..c421e02 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -53,6 +53,9 @@ liquid.setUptime(DateUtils.sdf4.parse(DateUtils.DateFormat(liquidDTO.getUptime()))); liquid.setLiquidData(liquidDTO.getLiquidData()); liquid.setWellCode(liquidDTO.getWellCode()); + liquid.setPci(liquidDTO.getPci()); + liquid.setRsrp(liquidDTO.getRsrp()); + liquid.setSnr(liquidDTO.getSnr()); save(liquid); } catch (Exception e) { e.printStackTrace(); @@ -62,6 +65,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -77,7 +83,8 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 LiquidDTO liquidDTO = new LiquidDTO(level, cell, - upTime, devCode, busWell == null ? "" : busWell.getWellCode()); + upTime, devCode, busWell == null ? "" : busWell.getWellCode(), + pci,rsrp,snr); this.saveData(liquidDTO);//存采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 836bb9c..3b50bcb 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -41,13 +41,14 @@ private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); public Map saveData(String address, String wellCode, - String strength, String cell, String uptime) { + String strength, String cell, String uptime, + String pci, String rsrp, String snr) { Map resultMap = new HashMap(); try { Methane methane = new Methane(address, wellCode, strength, cell, new Timestamp((DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)).getTime())), - new Timestamp((new Date()).getTime())); + new Timestamp((new Date()).getTime()),pci,rsrp,snr); save(methane); } catch (Exception e) { e.printStackTrace(); @@ -58,19 +59,22 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null != jsonObject.get("pci") ? jsonObject.get("pci").toString() : ""; + String rsrp = null != jsonObject.get("rsrp") ? jsonObject.get("rsrp").toString() : ""; + String snr = null != jsonObject.get("snr") ? jsonObject.get("snr").toString() : ""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { String gas = ((JSONObject) jsonArray.get(i)).get("gas").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - gas=String.format("%.2f", Double.valueOf(gas)); + gas = String.format("%.2f", Double.valueOf(gas)); //1.清离线 deviceManager.clearOffline(devCode); //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime, pci, rsrp, snr);//存储采集数据 //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 @@ -90,20 +94,20 @@ //1.清除上一条告警记录 alarmRecordManager.clearAlarm(devCode, "1", ""); //2.写入新的告警记录,工单号为上一条告警记录的工单号 - alarmRecordManager.saveData(alarmRecord.getJobId(), "1",alarmLevel, alarmContent, - gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime,alarmContent); + alarmRecordManager.saveData(alarmRecord.getJobId(), "1", alarmLevel, alarmContent, + gas, alarmRecord.getDevice(), devCode, alarmRecord.getWellCode(), upTime, alarmContent); } else {//不存在上一条报警时 Device device = deviceManager.getDeviceByDevCode(devCode); if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "1"); //2.写入新的告警 - alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, + alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, alarmContent, gas, device, - devCode, alarmJob.getWellCode(), upTime,alarmContent); + devCode, alarmJob.getWellCode(), upTime, alarmContent); //3.toDo:向app推送报警消息 - ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent,busWell == null ? "" : busWell.getWellCode()); + ThreadUtil.excuteMsg(alarmJob.getId(), alarmContent, busWell == null ? "" : busWell.getWellCode()); } } else {//未超限 //1.清除之前的报警 @@ -134,12 +138,12 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, "0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), "0"); } - alarmRecordManager.saveData(alarmJob.getId(), "2",null, + alarmRecordManager.saveData(alarmJob.getId(), "2", null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), String.valueOf(MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getIndex()), device, devCode, null != busWell ? busWell.getWellCode() : "", logTime, diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8eafa1c..6cc0619 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -40,13 +40,14 @@ // private static final double constant=0.0153; public Map saveData(String devId, String wellCode, String cell, String uptime, - String frequency, String dData) throws IOException { + String frequency, String dData, + String pci,String rsrp,String snr) throws IOException { Map resultMap = new HashMap(); try { NoiseDig noise = new NoiseDig(devId, wellCode, cell, DateUtils.sdf4.parse(DateUtils.DateFormat(uptime)), - frequency, dData); + frequency, dData,pci,rsrp,snr); save(noise); } catch (Exception e) { e.printStackTrace(); @@ -56,6 +57,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { @@ -70,7 +74,7 @@ //2.清除设备告警 alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 - saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 + saveData(devCode, busWell == null ? "" : busWell.getWellCode(), cell, upTime, freq, val,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） saveData(devCode, busWell == null ? "" : busWell.getWellCode(), gas, cell, upTime);//存储采集数据 if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.NoiseDig.toString());//获取报警阈值 List ruleRankList = new ArrayList(); diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 99a28e9..d84dcc7 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -43,14 +43,14 @@ private static String[] nameArr = {"温度", "湿度"}; public Map saveData(String devCode, String wellCode,String upTime, - String temperature, String humidity, String cell) { + String temperature, String humidity, String cell, + String pci,String rsrp,String snr) { Map resultMap = new HashMap(); try { TempHumi tempHumi = new TempHumi(devCode, wellCode, DateUtils.sdf4.parse(DateUtils.DateFormat(upTime)), - - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); save(tempHumi); } catch (Exception e) { e.printStackTrace(); @@ -61,6 +61,9 @@ public void processNormalData(JSONObject jsonObject, String devCode) { JSONArray jsonArray = (JSONArray) jsonObject.get("datas"); String cell = jsonObject.get("cell").toString(); + String pci = null!=jsonObject.get("pci")?jsonObject.get("pci").toString():""; + String rsrp = null!=jsonObject.get("rsrp")?jsonObject.get("rsrp").toString():""; + String snr = null!=jsonObject.get("snr")?jsonObject.get("snr").toString():""; BusWell busWell = busWellManager.getWellByDevCode(devCode); for (int i = 0; i < jsonArray.size(); i++) { try { @@ -76,7 +79,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, "2"); //3.存数据 saveData(devCode, busWell == null ? "" : busWell.getWellCode(), upTime, - temperature, humidity, cell); + temperature, humidity, cell,pci,rsrp,snr); //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; if (busWell != null) {//获取不到相关联的井，就无法获取告警规则，故不存库 diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 68b9e28..2e24ea6 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,7 +20,7 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=Casic203! ### ============================================================================ diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index df1fa88..2e24ea6 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -20,7 +20,7 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=Casic203! ### ============================================================================ @@ -59,7 +59,6 @@ # ============================================================================ log4jdbc.enable=false - # ============================================================================ # hibernate # ============================================================================