diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 94bc029..99a28e9 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -94,9 +94,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { if ((StringUtils.isNotBlank(temperature) && null != rankHighValue && - Float.parseFloat(temperature) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(temperature) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(temperature) && null != rankLowValue && - Float.parseFloat(temperature) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(temperature) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : @@ -115,9 +115,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { if ((StringUtils.isNotBlank(humidity) && null != rankHighValue && - Float.parseFloat(humidity) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(humidity) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(humidity) && null != rankLowValue && - Float.parseFloat(humidity) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(humidity) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 94bc029..99a28e9 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -94,9 +94,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { if ((StringUtils.isNotBlank(temperature) && null != rankHighValue && - Float.parseFloat(temperature) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(temperature) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(temperature) && null != rankLowValue && - Float.parseFloat(temperature) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(temperature) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : @@ -115,9 +115,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { if ((StringUtils.isNotBlank(humidity) && null != rankHighValue && - Float.parseFloat(humidity) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(humidity) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(humidity) && null != rankLowValue && - Float.parseFloat(humidity) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(humidity) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index cffd890..64c9be6 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -76,7 +76,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CO) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CO) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CO_OVER_THRESH.getName() : @@ -95,8 +95,8 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(O2) > Float.valueOf(rankHighValue.toString()) || - rankLowValue != null && Float.parseFloat(O2) < Float.valueOf(rankLowValue.toString())) { + if (rankHighValue != null && Float.parseFloat(O2) >= Float.valueOf(rankHighValue.toString()) || + rankLowValue != null && Float.parseFloat(O2) <= Float.valueOf(rankLowValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 14)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.O2_OVER_THRESH.getName() : @@ -115,7 +115,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[2].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CH4) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CH4) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 17)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CH4_OVER_THRESH.getName() : @@ -134,7 +134,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[3].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(H2S) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(H2S) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.H2S_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 94bc029..99a28e9 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -94,9 +94,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { if ((StringUtils.isNotBlank(temperature) && null != rankHighValue && - Float.parseFloat(temperature) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(temperature) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(temperature) && null != rankLowValue && - Float.parseFloat(temperature) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(temperature) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : @@ -115,9 +115,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { if ((StringUtils.isNotBlank(humidity) && null != rankHighValue && - Float.parseFloat(humidity) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(humidity) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(humidity) && null != rankLowValue && - Float.parseFloat(humidity) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(humidity) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index cffd890..64c9be6 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -76,7 +76,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CO) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CO) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CO_OVER_THRESH.getName() : @@ -95,8 +95,8 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(O2) > Float.valueOf(rankHighValue.toString()) || - rankLowValue != null && Float.parseFloat(O2) < Float.valueOf(rankLowValue.toString())) { + if (rankHighValue != null && Float.parseFloat(O2) >= Float.valueOf(rankHighValue.toString()) || + rankLowValue != null && Float.parseFloat(O2) <= Float.valueOf(rankLowValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 14)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.O2_OVER_THRESH.getName() : @@ -115,7 +115,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[2].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CH4) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CH4) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 17)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CH4_OVER_THRESH.getName() : @@ -134,7 +134,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[3].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(H2S) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(H2S) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.H2S_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index b51a39d..bcce2a6 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -31,7 +31,7 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 */2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 94bc029..99a28e9 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -94,9 +94,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { if ((StringUtils.isNotBlank(temperature) && null != rankHighValue && - Float.parseFloat(temperature) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(temperature) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(temperature) && null != rankLowValue && - Float.parseFloat(temperature) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(temperature) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : @@ -115,9 +115,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { if ((StringUtils.isNotBlank(humidity) && null != rankHighValue && - Float.parseFloat(humidity) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(humidity) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(humidity) && null != rankLowValue && - Float.parseFloat(humidity) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(humidity) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index cffd890..64c9be6 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -76,7 +76,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CO) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CO) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CO_OVER_THRESH.getName() : @@ -95,8 +95,8 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(O2) > Float.valueOf(rankHighValue.toString()) || - rankLowValue != null && Float.parseFloat(O2) < Float.valueOf(rankLowValue.toString())) { + if (rankHighValue != null && Float.parseFloat(O2) >= Float.valueOf(rankHighValue.toString()) || + rankLowValue != null && Float.parseFloat(O2) <= Float.valueOf(rankLowValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 14)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.O2_OVER_THRESH.getName() : @@ -115,7 +115,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[2].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CH4) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CH4) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 17)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CH4_OVER_THRESH.getName() : @@ -134,7 +134,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[3].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(H2S) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(H2S) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.H2S_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index b51a39d..bcce2a6 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -31,7 +31,7 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 */2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index cb0b73c..4be2373 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://119.254.103.80:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://139.198.17.115:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=root ### ============================================================================ @@ -166,6 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL = http://localhost:14537/job/updateSinkJob +sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +#sendURL =http://localhost:14537/job/updateSinkJob diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 7e1bbd3..74d6362 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -131,19 +131,21 @@ // 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\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":60,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"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\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; + temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"11111111114\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":-12,\"humidity\":82,\"uptime\":\"20200119150001\"}],\"logTime\":\"20200119150001\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // 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\":\"08888888885\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":0,\"O2\":1.1,\"H2S\":10000,\"CH4\":10000,\"liquidSwitch\":true,\"uptime\":\"20191217165124\"}],\"logTime\":\"20191217165124\"},\"ts\":1556182310514}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20191217163000\"}],\"logTime\":\"20191217160000\"},\"ts\":1556186030842}"; + temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"13131313132\",\"mBody\":{\"bType\":\"WasteGasData\",\"datas\":[{\"CO\":80,\"O2\":18,\"H2S\":10,\"CH4\":5,\"liquidSwitch\":true,\"uptime\":\"20191220165124\"}],\"logTime\":\"20191220165124\"},\"ts\":1556182310514}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"13131313135\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":98,\"datas\":[{\"level\":6.73,\"uptime\":\"20191217161000\"},{\"level\":5.72,\"uptime\":\"20191217162000\"},{\"level\":7.71,\"uptime\":\"20200211103000\"}],\"logTime\":\"20200211103000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; -// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"13131313136\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":1.83666,\"noiseFreq\":2040,\"uptime\":\"20191220125700\"}],\"logTime\":\"20191220123131\"},\"ts\":1556184691451}"; +// temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"12345654321\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":25,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"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); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/AlarmJob.java b/src/main/java/org/well/well/domain/AlarmJob.java index 81d036c..a992d85 100644 --- a/src/main/java/org/well/well/domain/AlarmJob.java +++ b/src/main/java/org/well/well/domain/AlarmJob.java @@ -112,6 +112,13 @@ private String flow; + /** + * 工单当前处理人员 + */ + @Column(name ="JOB_BELONG_TO") + private Long jobBelongTo; + + public Long getId() { return id; } @@ -256,5 +263,11 @@ this.flow = flow; } + public Long getJobBelongTo() { + return jobBelongTo; + } + public void setJobBelongTo(Long jobBelongTo) { + this.jobBelongTo = jobBelongTo; + } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 1a74d4e..698284d 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -46,6 +46,7 @@ alarmJob.setJobStatus("3"); alarmJob.setHandleJobTime(new Date()); alarmJob.setHandleMessage(message); + alarmJob.setJobBelongTo(null); save(alarmJob); } } catch (Exception e) { diff --git a/src/main/java/org/well/well/manager/DeviceManager.java b/src/main/java/org/well/well/manager/DeviceManager.java index 33e525a..30b22b4 100644 --- a/src/main/java/org/well/well/manager/DeviceManager.java +++ b/src/main/java/org/well/well/manager/DeviceManager.java @@ -71,7 +71,7 @@ paramMap.put("devCode", device.getDevCode()); paramMap.put("beg", DateUtils.sdf_day.format(DateUtils.getSevenBeforeDate())); List list = getSession().createSQLQuery(sql).setProperties(paramMap).list(); - if (list.size() == 0) { + if (list==null||list.size() == 0) { setOfflineBySevenNoData(device.getDevCode()); } } catch (Exception e) { @@ -98,7 +98,7 @@ " where date_format(LOGTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; findDeviceDataInSevenDays(device, sql); - } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())) { + } else if (devTypeName.equals(DeviceTypeEnum.Methane.toString())){ sql = "select * from data_gas " + " where date_format(UPTIME,'%Y-%m-%d')>=:beg and" + " DEVCODE=:devCode"; diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 42686d2..67837f4 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.text.DecimalFormat; import java.util.*; @@ -103,7 +104,7 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(level) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + if (Float.valueOf(level) >= (new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh))).floatValue()/100) { alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } diff --git a/src/main/java/org/well/well/manager/LocatorManager.java b/src/main/java/org/well/well/manager/LocatorManager.java index 25698f0..940297c 100644 --- a/src/main/java/org/well/well/manager/LocatorManager.java +++ b/src/main/java/org/well/well/manager/LocatorManager.java @@ -44,12 +44,12 @@ String longitude = ((JSONObject) jsonArray.get(i)).get("longitude").toString(); String latitude = ((JSONObject) jsonArray.get(i)).get("latitude").toString(); if (StringUtils.isBlank(longitude) || StringUtils.isBlank(latitude)) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; } else { if (Float.valueOf(longitude) < 1 || Float.valueOf(latitude) < 1) { - longitude = null != busWell ? busWell.getLatBaidu() : longitude; - latitude = null != busWell ? busWell.getLatBaidu() : latitude; + longitude = null != busWell ? busWell.getCoordinateX() : longitude; + latitude = null != busWell ? busWell.getCoordinateY() : latitude; }else { // Map stringObjectMap=PointConvertUtility. // convertBaiduAPI(longitude,latitude); diff --git a/src/main/java/org/well/well/manager/MeterManager.java b/src/main/java/org/well/well/manager/MeterManager.java index 6cb9dfb..3f0cfee 100644 --- a/src/main/java/org/well/well/manager/MeterManager.java +++ b/src/main/java/org/well/well/manager/MeterManager.java @@ -33,41 +33,41 @@ save(new DataMeter(meterMap,null==busWell?"":busWell.getWellCode())); //3.有无超限 String alarmContent = "", alarmValue = ""; - if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>60){ + if(StringUtils.isNotBlank(meterMap.get("temp"))&&Float.valueOf(meterMap.get("temp"))>=60){ alarmContent+="温度超限报警,"; alarmValue+="温度:" + meterMap.get("temp") + "℃,"; } - if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>10|| - Float.valueOf(meterMap.get("PH"))<6)){ + if(StringUtils.isNotBlank(meterMap.get("PH"))&&(Float.valueOf(meterMap.get("PH"))>=10|| + Float.valueOf(meterMap.get("PH"))<=6)){ alarmContent+="PH值超限报警,"; alarmValue+="PH:" + meterMap.get("PH") + ","; } if(StringUtils.isNotBlank(meterMap.get("conductivity"))&& - Float.valueOf(meterMap.get("conductivity"))>5){ + Float.valueOf(meterMap.get("conductivity"))>=5){ alarmContent+="电导率超限报警,"; alarmValue+="电导率:" + meterMap.get("conductivity") + "mS/cm,"; } - if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>20){ + if(StringUtils.isNotBlank(meterMap.get("DO"))&&Float.valueOf(meterMap.get("DO"))>=20){ alarmContent+="溶解氧超限报警,"; alarmValue+="溶解氧:" + meterMap.get("DO") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>1000){ + if(StringUtils.isNotBlank(meterMap.get("turbidity"))&&Float.valueOf(meterMap.get("turbidity"))>=1000){ alarmContent+="浊度超限报警,"; alarmValue+="浊度:" + meterMap.get("turbidity") + "NTU,"; } - if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>500){ + if(StringUtils.isNotBlank(meterMap.get("COD"))&&Float.valueOf(meterMap.get("COD"))>=500){ alarmContent+="化学需氧量超限报警,"; alarmValue+="化学需氧量:" + meterMap.get("COD") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>20){ + if(StringUtils.isNotBlank(meterMap.get("AN"))&&Float.valueOf(meterMap.get("AN"))>=20){ alarmContent+="氨氮超限报警,"; alarmValue+="氨氮:" + meterMap.get("AN") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>15){ + if(StringUtils.isNotBlank(meterMap.get("TP"))&&Float.valueOf(meterMap.get("TP"))>=15){ alarmContent+="总磷超限报警,"; alarmValue+="总磷:" + meterMap.get("TP") + "mg/L,"; } - if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>30){ + if(StringUtils.isNotBlank(meterMap.get("TN"))&&Float.valueOf(meterMap.get("TN"))>=30){ alarmContent+="总氮超限报警,"; alarmValue+="总氮:" + meterMap.get("TN") + "mg/L,"; } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index d4245a9..836bb9c 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -74,7 +74,7 @@ //4.有无超限处理流程（判断最后一条数据） if (i < jsonArray.size() - 1) continue; String thresh = alarmRuleManager.getRuleStr(devCode, DeviceTypeEnum.Methane.toString());//获取报警阈值 - if (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1])) {//浓度超限 + if (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1])) {//浓度超限 AlarmRecord alarmRecord = alarmRecordManager.getThresholdAlarm(devCode); //获取报警等级 String alarmContent = MethaneAlarmEnum.OVER_THRESH.getName(); @@ -83,8 +83,8 @@ // MethaneAlarmEnum.OVER_THRESH1.getName() : // (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? // MethaneAlarmEnum.OVER_THRESH2.getName() : alarmContent); - alarmLevel = Float.valueOf(gas) > Float.valueOf(thresh.split(",")[0]) ? - 1 : (Float.valueOf(gas) > Float.valueOf(thresh.split(",")[1]) ? + alarmLevel = Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[0]) ? + 1 : (Float.valueOf(gas) >= Float.valueOf(thresh.split(",")[1]) ? 2 : alarmLevel); if (null != alarmRecord) {//已存在报警 //1.清除上一条告警记录 diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index 8d0a03e..8eafa1c 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.io.IOException; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -95,7 +96,8 @@ for (int j = 0; j < ruleRankList.size(); j++) { Object rankValue = ((Object[]) ruleRankList.get(j))[2]; if (null != rankValue) { - if (Float.valueOf(val) >= (Float.valueOf(rankValue.toString()) / 100 * Float.valueOf(thresh))) { + + if (Float.valueOf(val) >= ( new BigDecimal(rankValue.toString()).multiply(new BigDecimal(thresh)).floatValue())/100) { // NoiseDigAlarmEnum noiseDigAlarmEnum=NoiseDigAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 4)); // alarmContent = noiseDigAlarmEnum!=null?noiseDigAlarmEnum.getName():alarmContent; diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 94bc029..99a28e9 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -94,9 +94,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { if ((StringUtils.isNotBlank(temperature) && null != rankHighValue && - Float.parseFloat(temperature) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(temperature) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(temperature) && null != rankLowValue && - Float.parseFloat(temperature) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(temperature) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : @@ -115,9 +115,9 @@ Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { if ((StringUtils.isNotBlank(humidity) && null != rankHighValue && - Float.parseFloat(humidity) > Float.parseFloat(rankHighValue.toString())) || + Float.parseFloat(humidity) >= Float.parseFloat(rankHighValue.toString())) || (StringUtils.isNotBlank(humidity) && null != rankLowValue && - Float.parseFloat(humidity) < Float.parseFloat(rankLowValue.toString()))) { + Float.parseFloat(humidity) <= Float.parseFloat(rankLowValue.toString()))) { // TempHumiAlarmEnum tempHumiAlarmEnum = TempHumiAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index cffd890..64c9be6 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -76,7 +76,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[0].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CO) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CO) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 8)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CO_OVER_THRESH.getName() : @@ -95,8 +95,8 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[1].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(O2) > Float.valueOf(rankHighValue.toString()) || - rankLowValue != null && Float.parseFloat(O2) < Float.valueOf(rankLowValue.toString())) { + if (rankHighValue != null && Float.parseFloat(O2) >= Float.valueOf(rankHighValue.toString()) || + rankLowValue != null && Float.parseFloat(O2) <= Float.valueOf(rankLowValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 14)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.O2_OVER_THRESH.getName() : @@ -115,7 +115,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[2].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(CH4) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(CH4) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 17)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.CH4_OVER_THRESH.getName() : @@ -134,7 +134,7 @@ Object rankHighValue = ((Object[]) ruleRankList.get(j))[2]; Object gasName = ((Object[]) ruleRankList.get(j))[3]; if (gasName != null && nameArr[3].equals(gasName.toString())) { - if (rankHighValue != null && Float.parseFloat(H2S) > Float.valueOf(rankHighValue.toString())) { + if (rankHighValue != null && Float.parseFloat(H2S) >= Float.valueOf(rankHighValue.toString())) { // WasteGasAlarmEnum wasteGasAlarmEnum = WasteGasAlarmEnum.getByIndex( // String.valueOf(Long.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) + 11)); // alarmContent += (wasteGasAlarmEnum == null ? WasteGasAlarmEnum.H2S_OVER_THRESH.getName() : diff --git a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java index b51a39d..bcce2a6 100644 --- a/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java +++ b/src/main/java/org/well/well/scheduler/DeviceCheckingJob.java @@ -31,7 +31,7 @@ // every 10 seconds @Scheduled(cron = "0 0 5 * * ?") // @Scheduled(cron = "0 0/1 * * * ?") -// @Scheduled(cron = "0 */2 * * * ?") +// @Scheduled(cron = "0 0/2 * * * ?") public void execute() { if (!enabled) { return; diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index cb0b73c..4be2373 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://119.254.103.80:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://139.198.17.115:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=root ### ============================================================================ @@ -166,6 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL = http://localhost:14537/job/updateSinkJob +sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +#sendURL =http://localhost:14537/job/updateSinkJob diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index b942812..4be2373 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://119.254.103.80:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://139.198.17.115:3000/smartwell_yizhuang?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root db.default.password=root ### ============================================================================ @@ -166,6 +166,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL = http://119.254.103.80:14537/job/updateSinkJob +sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob +#sendURL =http://localhost:14537/job/updateSinkJob