diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; 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 f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ecbd415..25945d6 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -95,8 +95,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, gas, device, @@ -135,12 +134,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ecbd415..25945d6 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -95,8 +95,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, gas, device, @@ -135,12 +134,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b71550f..2b2c4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -105,8 +105,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, val, device, @@ -145,12 +144,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ecbd415..25945d6 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -95,8 +95,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, gas, device, @@ -135,12 +134,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b71550f..2b2c4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -105,8 +105,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, val, device, @@ -145,12 +144,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index a3ff149..d29f89c 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -95,7 +95,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Temp_OVER_THRESH.getName() + ","; - alarmValue += "temp:" + temperature + "℃,"; + alarmValue += "温度:" + temperature + "℃,"; alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } @@ -116,7 +116,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Humi_OVER_THRESH.getName() + ","; - alarmValue += "humi:" + humidity + "%RH,"; + alarmValue += "湿度:" + humidity + "%RH,"; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; break; @@ -140,8 +140,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, TempHumiAlarmEnum.OVER_THRESH.getName(), @@ -182,12 +181,10 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //3.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"0"); } //4.写入新的报警 alarmRecordManager.saveData(alarmJob.getId(), "2", null, diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ecbd415..25945d6 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -95,8 +95,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, gas, device, @@ -135,12 +134,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b71550f..2b2c4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -105,8 +105,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, val, device, @@ -145,12 +144,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index a3ff149..d29f89c 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -95,7 +95,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Temp_OVER_THRESH.getName() + ","; - alarmValue += "temp:" + temperature + "℃,"; + alarmValue += "温度:" + temperature + "℃,"; alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } @@ -116,7 +116,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Humi_OVER_THRESH.getName() + ","; - alarmValue += "humi:" + humidity + "%RH,"; + alarmValue += "湿度:" + humidity + "%RH,"; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; break; @@ -140,8 +140,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, TempHumiAlarmEnum.OVER_THRESH.getName(), @@ -182,12 +181,10 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //3.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"0"); } //4.写入新的报警 alarmRecordManager.saveData(alarmJob.getId(), "2", null, diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 236ac5f..8e261fb 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 @@ // wasteGasAlarmEnum.getName()) + ","; alarmContent += WasteGasAlarmEnum.CO_OVER_THRESH.getName() + ","; alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); - alarmValue += "CO:" + CO + "ppm,"; + alarmValue += "一氧化碳:" + CO + "ppm,"; break; } } @@ -97,7 +97,7 @@ alarmContent += WasteGasAlarmEnum.O2_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "O2:" + O2 + "%VOL,"; + alarmValue += "氧气:" + O2 + "%VOL,"; break; } } @@ -116,7 +116,7 @@ alarmContent += WasteGasAlarmEnum.CH4_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "CH4:" + CH4 + "%VOL,"; + alarmValue += "甲烷:" + CH4 + "%VOL,"; break; } } @@ -135,7 +135,7 @@ alarmContent += WasteGasAlarmEnum.H2S_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "H2S:" + H2S + "ppm,"; + alarmValue += "硫化氢:" + H2S + "ppm,"; break; } } @@ -189,8 +189,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.WasteGas.toString(), - WasteGasAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.WasteGas.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, WasteGasAlarmEnum.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 f095cdf..371ab51 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,18 +125,18 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20190605000000\"}],\"logTime\":\"201906010003002\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"level\":0.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"1120180002\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; + temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.12,\"uptime\":\"20190502000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; // temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellLowBatteryAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; + temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"Dig\",\"devCode\":\"61201900001\",\"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\":31.533299999999997,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":2.99591,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; -// temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":20,\"O2\":25,\"H2S\":15,\"CH4\":1,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; -// temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":15.1,\"humidity\":16.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; +// 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.1,\"humidity\":26.7,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"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\":8.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// 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\":\"Well\",\"devCode\":\"412019010212\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017140118\",\"bType\":\"WellEvent\"},\"ts\":1571292078959}"; +// temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/domain/WasteGas.java b/src/main/java/org/well/well/domain/WasteGas.java index bfdfff4..7941644 100644 --- a/src/main/java/org/well/well/domain/WasteGas.java +++ b/src/main/java/org/well/well/domain/WasteGas.java @@ -22,7 +22,7 @@ private String h2S; private String fireGas; private String descn; - private Boolean isOpen; + private String isOpen; @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -96,12 +96,12 @@ } @Column(name = "SWITCH") - public Boolean getOpen() { + public String getIsOpen() { return isOpen; } - public void setOpen(Boolean open) { - isOpen = open; + public void setIsOpen(String isOpen) { + this.isOpen = isOpen; } @Column(name="WELL_CODE") @@ -140,6 +140,7 @@ this.o2 = O2; this.h2S = H2S; this.fireGas = CH4; - this.isOpen = isOpen; + this.isOpen = isOpen?"开":"关"; + this.logTime = new Date(); } } diff --git a/src/main/java/org/well/well/manager/AlarmJobManager.java b/src/main/java/org/well/well/manager/AlarmJobManager.java index 10df679..8b9114a 100644 --- a/src/main/java/org/well/well/manager/AlarmJobManager.java +++ b/src/main/java/org/well/well/manager/AlarmJobManager.java @@ -92,7 +92,7 @@ criteria.add(Restrictions.eq("devcode", devCode)); // criteria.add(Restrictions.ne("jobStatus", "3")); criteria.add(Restrictions.in("jobStatus", new String[]{"0", "1", "2"})); -// criteria.add(Restrictions.eq("jogType", jobType)); + criteria.add(Restrictions.eq("jogType", jobType)); criteria.addOrder(Order.desc("createTime")); return (AlarmJob) criteria.setMaxResults(1).uniqueResult(); } diff --git a/src/main/java/org/well/well/manager/AlarmRecordManager.java b/src/main/java/org/well/well/manager/AlarmRecordManager.java index 4369eb2..26c55ef 100644 --- a/src/main/java/org/well/well/manager/AlarmRecordManager.java +++ b/src/main/java/org/well/well/manager/AlarmRecordManager.java @@ -93,7 +93,7 @@ Criteria criteria = getSession().createCriteria(AlarmRecord.class); criteria.add(Restrictions.eq("deviceCode", devCode)); -// criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); + criteria.add(Restrictions.eq("alarmType", alarmTypeArr[0])); criteria.add(Restrictions.eq("status", alarmStatusArr[1])); List alarmRecordList = criteria.list(); return alarmRecordList != null && alarmRecordList.size() > 0 ? diff --git a/src/main/java/org/well/well/manager/LiquidManager.java b/src/main/java/org/well/well/manager/LiquidManager.java index 146a46d..a79a901 100644 --- a/src/main/java/org/well/well/manager/LiquidManager.java +++ b/src/main/java/org/well/well/manager/LiquidManager.java @@ -108,8 +108,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, level, device, @@ -148,12 +147,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(), - LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Liquid.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, LiquidAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index ecbd415..25945d6 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -95,8 +95,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, gas, device, @@ -135,12 +134,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(), - MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Methane.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, MethaneAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/NoiseDigManager.java b/src/main/java/org/well/well/manager/NoiseDigManager.java index b71550f..2b2c4e2 100644 --- a/src/main/java/org/well/well/manager/NoiseDigManager.java +++ b/src/main/java/org/well/well/manager/NoiseDigManager.java @@ -105,8 +105,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1",alarmLevel, alarmContent, val, device, @@ -145,12 +144,10 @@ if (null == device) return;//没注册设备舍弃 BusWell busWell = busWellManager.getWellByDevCode(devCode); //4.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(), - NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.Dig.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, NoiseDigAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(), diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index a3ff149..d29f89c 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -95,7 +95,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Temp_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Temp_OVER_THRESH.getName() + ","; - alarmValue += "temp:" + temperature + "℃,"; + alarmValue += "温度:" + temperature + "℃,"; alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); break; } @@ -116,7 +116,7 @@ // alarmContent += (tempHumiAlarmEnum == null ? TempHumiAlarmEnum.Humi_OVER_THRESH.getName() : // tempHumiAlarmEnum.getName()) + ","; alarmContent += TempHumiAlarmEnum.Humi_OVER_THRESH.getName() + ","; - alarmValue += "humi:" + humidity + "%RH,"; + alarmValue += "湿度:" + humidity + "%RH,"; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; break; @@ -140,8 +140,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, TempHumiAlarmEnum.OVER_THRESH.getName(), @@ -182,12 +181,10 @@ BusWell busWell = busWellManager.getWellByDevCode(devCode); //3.若无工单写入新的工单 - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(), - TempHumiAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + busWell.getWellCode() : "", DeviceTypeEnum.TempHumi.toString(),"0"); } //4.写入新的报警 alarmRecordManager.saveData(alarmJob.getId(), "2", null, diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 236ac5f..8e261fb 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 @@ // wasteGasAlarmEnum.getName()) + ","; alarmContent += WasteGasAlarmEnum.CO_OVER_THRESH.getName() + ","; alarmLevel = Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()); - alarmValue += "CO:" + CO + "ppm,"; + alarmValue += "一氧化碳:" + CO + "ppm,"; break; } } @@ -97,7 +97,7 @@ alarmContent += WasteGasAlarmEnum.O2_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "O2:" + O2 + "%VOL,"; + alarmValue += "氧气:" + O2 + "%VOL,"; break; } } @@ -116,7 +116,7 @@ alarmContent += WasteGasAlarmEnum.CH4_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "CH4:" + CH4 + "%VOL,"; + alarmValue += "甲烷:" + CH4 + "%VOL,"; break; } } @@ -135,7 +135,7 @@ alarmContent += WasteGasAlarmEnum.H2S_OVER_THRESH.getName() + ","; alarmLevel = alarmLevel > Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) ? Integer.valueOf(((Object[]) ruleRankList.get(j))[0].toString()) : alarmLevel; - alarmValue += "H2S:" + H2S + "ppm,"; + alarmValue += "硫化氢:" + H2S + "ppm,"; break; } } @@ -189,8 +189,7 @@ if (device == null) return;//未注册设备舍弃 //1.生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell != null ? - busWell.getWellCode() : "", DeviceTypeEnum.WasteGas.toString(), - WasteGasAlarmEnum.OVER_THRESH.getName()); + busWell.getWellCode() : "", DeviceTypeEnum.WasteGas.toString(),"1"); //2.写入新的告警 alarmRecordManager.saveData(alarmJob.getId(), "1", alarmLevel, WasteGasAlarmEnum.OVER_THRESH.getName(), diff --git a/src/main/java/org/well/well/manager/WellManager.java b/src/main/java/org/well/well/manager/WellManager.java index c0e1416..11ff839 100644 --- a/src/main/java/org/well/well/manager/WellManager.java +++ b/src/main/java/org/well/well/manager/WellManager.java @@ -102,7 +102,7 @@ if(device==null) return; //没注册舍弃 //生成新的工单 AlarmJob alarmJob = alarmJobManager.saveData(devCode, busWell.getWellCode(), - DeviceTypeEnum.Well.toString(),WellAlarmEnum.WellOpenAlarm.getName()); + DeviceTypeEnum.Well.toString(),"1"); alarmRecordManager.saveData(alarmJob.getId(), "1",null, WellAlarmEnum.WellOpenAlarm.getName(), @@ -125,11 +125,10 @@ //写入新的报警 Device device = deviceManager.getDeviceByDevCode(devCode); if (null == device) return; - AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode, - WellAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + AlarmJob alarmJob = alarmJobManager.getByDevAndType(devCode,"0"); if (null == alarmJob) { alarmJob = alarmJobManager.saveData(devCode, busWell.getWellCode(), - DeviceTypeEnum.Well.toString(),WellAlarmEnum.valueOf(jsonArray.get(i).toString()).getName()); + DeviceTypeEnum.Well.toString(),"0"); } alarmRecordManager.saveData(alarmJob.getId(), "2",null, WellAlarmEnum.valueOf(jsonArray.get(i).toString()).getName(),