post and get on the same port handle json

aleemont1 · Feb 13, 2024 · 771e4d4 · 771e4d4
1 parent 5987f3a
commit 771e4d4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/river-monitoring-dashboard/river-monitoring-dashboard.py b/river-monitoring-dashboard/river-monitoring-dashboard.py
@@ -70,7 +70,7 @@ def get_post_data():
         Input("send-autoMode", "n_clicks")
         ])
 def send_manualMode(n_clicks):
-    url = "http://localhost:8051/api/postdata"
+    url = "http://localhost:8050/api/postdata"
     if n_clicks is None:
         return [""]
     else:
@@ -85,15 +85,10 @@ def send_manualMode(n_clicks):
               [Input("send-valveValue", "n_clicks")],
               [State("valveValue", "value")])
 def send_valveValue(n_clicks, valveValue):
-    url = "http://127.0.0.1:8050/api/postdata"
+    url = "http://localhost:8050/api/postdata"
     if n_clicks > 0:
         data = {
-            "valveValue": valveValue,
-<<<<<<< HEAD:river-monitoring-dashboard/dashboard.py
-            "isManual": False
-=======
-            "isManual": True
->>>>>>> 813bc22bd155b19aea2c45c010e24b02990f1526:river-monitoring-dashboard/river-monitoring-dashboard.py
+            "valveValue": valveValue
         }
         response = requests.post(url, data=json.dumps(data), headers={"Content-Type": "application/json"})
         print(response.text)

diff --git a/river-monitoring-service/Server/src/main/java/org/mqttserver/services/HTTP/DataService.java b/river-monitoring-service/Server/src/main/java/org/mqttserver/services/HTTP/DataService.java
@@ -38,12 +38,22 @@ private void handleAddNewData(RoutingContext routingContext) {
         if (res == null) {
             sendError(400, response);
         } else {
-            int valveValue = res.getInteger("valveValue");
-            boolean isManual = res.getBoolean("isManual");
-            System.err.println("Valve value received from dashboard: " + valveValue + " and isManual: " + isManual);
+            try {
+                int valveValue = res.getInteger("valveValue");
+                broker.getSystemController().setValveValueFromDashboard(valveValue);
+                broker.getSystemController().setIsManual(true);
+                System.out.println("[OPERATOR] Valve Value set manually");
+            } catch (Exception ex) {
+
+            }
+
+            try {
+                boolean isManual = res.getBoolean("isManual");
+                broker.getSystemController().setIsManual(isManual);
+            } catch (Exception ex) {
+
+            }
             response.setStatusCode(200).end();
-            broker.getSystemController().setValveValueFromDashboard(valveValue);
-            broker.getSystemController().setIsManual(isManual);
         }
     }