diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 25cb46b..f386176 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -143,7 +143,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; 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 25cb46b..f386176 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -143,7 +143,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d480000..245b30e 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -69,7 +69,7 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - Float wellDeep=busWell!=null?busWell.getDeep():0; + Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 25cb46b..f386176 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -143,7 +143,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d480000..245b30e 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -69,7 +69,7 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - Float wellDeep=busWell!=null?busWell.getDeep():0; + Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 04496e7..dd4c107 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=123456 +db.default.password=Casic203! ### ============================================================================ # dbReal # ============================================================================ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 25cb46b..f386176 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -143,7 +143,7 @@ // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"642019010387\",\"mBody\":{\"datas\":[{\"longitude\":0.0,\"latitude\":0.0,\"uptime\":\"20200118111000\"}],\"logTime\":\"20200118111006\",\"bType\":\"LocatorData\"},\"ts\":1579317006078}"; temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010202\",\"mBody\":{\"cell\":100,\"datas\":[{\"gas\":1.1,\"uptime\":\"20190825232100\"},{\"liquid\":0.0,\"uptime\":\"20190825232600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190825234100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"liquid\":0.0,\"uptime\":\"20190826002600\"},{\"liquid\":0.0,\"uptime\":\"20210325233100\"},{\"gas\":0.1,\"uptime\":\"20210325232100\"}],\"logTime\":\"20210325233100\",\"bType\":\"LGData\"},\"ts\":1566750815981}"; - + temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"321120080150\",\"mBody\":{\"cell\":90,\"datas\":[{\"liquid\":55.8,\"uptime\":\"20210511191000\"},{\"liquid\":55.8,\"uptime\":\"20210511201000\"},{\"liquid\":55.8,\"uptime\":\"20210511211000\"},{\"liquid\":55.8,\"uptime\":\"20210511221000\"},{\"liquid\":55.8,\"uptime\":\"20210511231000\"},{\"liquid\":55.8,\"uptime\":\"20210512001000\"},{\"liquid\":55.8,\"uptime\":\"20210512011000\"},{\"liquid\":55.8,\"uptime\":\"20210512021000\"},{\"liquid\":55.8,\"uptime\":\"20210512031000\"},{\"liquid\":55.8,\"uptime\":\"20210512041000\"},{\"liquid\":55.8,\"uptime\":\"20210512051000\"},{\"liquid\":55.8,\"uptime\":\"20210512061000\"},{\"liquid\":55.8,\"uptime\":\"20210512071000\"},{\"liquid\":55.8,\"uptime\":\"20210512081000\"},{\"liquid\":55.8,\"uptime\":\"20210512091000\"},{\"liquid\":55.8,\"uptime\":\"20210512101000\"},{\"liquid\":55.8,\"uptime\":\"20210512111000\"},{\"liquid\":55.8,\"uptime\":\"20210512121000\"},{\"liquid\":55.8,\"uptime\":\"20210512131000\"},{\"liquid\":55.8,\"uptime\":\"20210512141000\"},{\"liquid\":55.8,\"uptime\":\"20210512151000\"},{\"liquid\":55.8,\"uptime\":\"20210512161000\"},{\"liquid\":55.8,\"uptime\":\"20210512171000\"},{\"liquid\":55.8,\"uptime\":\"20210512181000\"}],\"logTime\":\"20210513092856\",\"bType\":\"LGData\"},\"ts\":1620869336245}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); resp.process(temp); diff --git a/src/main/java/org/well/well/manager/LGLiquidManager.java b/src/main/java/org/well/well/manager/LGLiquidManager.java index d480000..245b30e 100644 --- a/src/main/java/org/well/well/manager/LGLiquidManager.java +++ b/src/main/java/org/well/well/manager/LGLiquidManager.java @@ -69,7 +69,7 @@ } String level = ((JSONObject) jsonArray.get(i)).get("liquid").toString(); String upTime = ((JSONObject) jsonArray.get(i)).get("uptime").toString(); - Float wellDeep=busWell!=null?busWell.getDeep():0; + Float wellDeep=busWell!=null?busWell.getDeep()==null?0:busWell.getDeep():0; Float liquidHeight=StringUtils.isNotBlank(level)?Float.valueOf(level)/100:0; level = String.format("%.2f",wellDeep+liquidHeight); diff --git a/src/main/resources/wellSensor/application.properties b/src/main/resources/wellSensor/application.properties index 04496e7..dd4c107 100644 --- a/src/main/resources/wellSensor/application.properties +++ b/src/main/resources/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=123456 +db.default.password=Casic203! ### ============================================================================ # dbReal # ============================================================================ diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index 04496e7..dd4c107 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -20,9 +20,9 @@ #db.default.username=sensor #db.default.password=sensor db.default.driverClassName=com.mysql.jdbc.Driver -db.default.url=jdbc:mysql://192.168.8.104:3000/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false +db.default.url=jdbc:mysql://111.198.10.15:11102/smartwell_br?useUnicode=true&characterEncoding=UTF-8&useSSL=false db.default.username=root -db.default.password=123456 +db.default.password=Casic203! ### ============================================================================ # dbReal # ============================================================================