diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 92e1840..bca4fde 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,12 +142,12 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; + temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019122104\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; - temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; +// temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; 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 92e1840..bca4fde 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,12 +142,12 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; + temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019122104\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; - temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; +// temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 68b9e28..389ee74 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -165,7 +165,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL =http://111.198.10.15:11302/smartwell/job/updateSinkJob +sendURL =http://localhost:14537/job/updateSinkJob diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 92e1840..bca4fde 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -142,12 +142,12 @@ // temp="{\"mType\":\"SetResponse\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidConfigSuccess\"},\"ts\":1556182310514}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"12121212125\",\"mBody\":{\"bType\":\"LiquidData\",\"cell\":97,\"datas\":[{\"level\":4,\"uptime\":\"20191219150000\"},{\"level\":4,\"uptime\":\"20191219151000\"},{\"level\":6.5,\"uptime\":\"20191219152000\"}],\"logTime\":\"20191219152000\"},\"ts\":1556186030842}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"bType\":\"NoiseDigData\",\"cell\":88,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"noiseVal\":60,\"noiseFreq\":50,\"uptime\":\"20200109123131\"}],\"logTime\":\"20200119123131\"},\"ts\":1556184691451}"; -// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"13131313131\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; + temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412019122104\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20191017154056\",\"bType\":\"WellEvent\"},\"ts\":1571298056241}"; // temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312020011111\",\"mBody\":{\"cell\":95,\"pci\":100,\"rsrp\":50,\"snr\":20,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20200407085400\"},{\"gas\":0.080566406,\"uptime\":\"20200407085400\"},{\"gas\":25,\"uptime\":\"20200407085400\"},{\"gas\":0.09990235,\"uptime\":\"20200407085400\"},{\"gas\":0.070898436,\"uptime\":\"20200407085400\"},{\"gas\":60,\"uptime\":\"20200408085400\"}],\"logTime\":\"20200407085400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; - temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; +// temp="{\"Status\":\"[{\\\"Value\\\":7.8876,\\\"Key\\\":\\\"PH\\\"},{\\\"Value\\\":28.0265,\\\"Key\\\":\\\"Temp\\\"},{\\\"Value\\\":0.1994,\\\"Key\\\":\\\"Turb\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"Cond\\\"},{\\\"Value\\\":0.5252,\\\"Key\\\":\\\"DO\\\"},{\\\"Value\\\":0,\\\"Key\\\":\\\"COD\\\"},{\\\"Value\\\":2746.4216,\\\"Key\\\":\\\"AN\\\"},{\\\"Value\\\":1.0002,\\\"Key\\\":\\\"TP\\\"},{\\\"Value\\\":1.4385,\\\"Key\\\":\\\"TN\\\"},{\\\"Value\\\":100,\\\"Key\\\":\\\"Power\\\"}]\",\"devType\":\"WaterQuality\",\"LogTime\":\"2020-06-30 16:21:36\",\"DevID\":\"W1L30Z\",\"Provider\":\"KaiNa\"}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 68b9e28..389ee74 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -165,7 +165,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL =http://111.198.10.15:11302/smartwell/job/updateSinkJob +sendURL =http://localhost:14537/job/updateSinkJob diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 68b9e28..389ee74 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -165,7 +165,7 @@ # ============================================================================ # 告警、工单推送地址 # ============================================================================ -sendURL =http://139.198.17.115:20004/smartwell/job/updateSinkJob -#sendURL =http://localhost:14537/job/updateSinkJob +#sendURL =http://111.198.10.15:11302/smartwell/job/updateSinkJob +sendURL =http://localhost:14537/job/updateSinkJob