ADD: NEW CHANGES

FIX : Reworked ApiCall
FIX : Reworked Rule Engine
FIX : Reworked drl files

src/main/java/eu/hsrw/ias/ggd/ApiCall.java

@@ -6,17 +6,17 @@ import JSON_Unpack.ReadSensors4Partner;
 import org.json.JSONArray;
 import org.json.JSONObject;
 
-import javax.swing.*;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 
+
 public class ApiCall {
     private static String token = "0";
     private static String oldId = "1";
 
 
-    public static HashMap<String, Double> FetchDataFromApi() throws Exception {
+    public static HashMap<String, SensorData> FetchDataFromApi() throws Exception {
 
 
         UserCredentials userCredentials = new UserCredentials();
@@ -35,64 +35,34 @@ public class ApiCall {
                 JSONObject obj = new JSONObject(outputToken);
                 token = obj.getString("id");
 
-                writingIntoFile.WriteFile(homeRoot+"securityToken.txt", token);
+                writingIntoFile.WriteFile(homeRoot + "securityToken.txt", token);
                 oldId = token;
             } catch (Exception e) {
                 e.printStackTrace();
             }
         }
         ReadSensors4Partner readSensors4Partner = new ReadSensors4Partner();
-        ArrayList<String> outputValue = (readSensors4Partner.FetchSensor4Box("Germes",token));
-        String workingArray = String.valueOf(outputValue).replace("[{","{").replace("}]","}");
+        ArrayList<String> outputValue = (readSensors4Partner.FetchSensor4Box("Germes", token));
+        String workingArray = String.valueOf(outputValue).replace("[{", "{").replace("}]", "}");
 
         JSONArray jsonArray = new JSONArray(workingArray);
 
-        HashMap<String, Double> sensors = new HashMap<String, Double>();
-        for(int j = 0; j<jsonArray.length(); j++) {
+        HashMap<String,
+                SensorData> finalOutput = new HashMap();
+
+        for (int j = 0; j < jsonArray.length(); j++) {
+
             JSONObject jsonobject = jsonArray.getJSONObject(j);
             double value = jsonobject.getDouble("value");
             String sensorTag = jsonobject.getString("sensorTag");
-//            System.out.println(value);
-//            System.out.println(sensorTag);
-//            sensorsMap.setSensors(sensorTag,value);
-            sensors.put(sensorTag,value);
+            String sensorId = jsonobject.getString("sensorId");
+
+            finalOutput.put(sensorTag, new SensorData(sensorId, value));
+
         }
 
-//        ArrayList<String> listOfCompanies = new ArrayList<>();
-//        String germesOutput = FetchData("Germes",token);
-//        listOfCompanies.add(FetchData(c1,token));
-//        listOfCompanies.add(FetchData("Heufs",token));
-
-        JOptionPane.showMessageDialog(null,sensors,"Germes sensors"+now,JOptionPane.INFORMATION_MESSAGE);
-
-        return sensors;
+        return finalOutput;
 
     }
 
-//    public static void FetchData(String companyName, String token){
-//        ReadSensors4Partner readSensors4Partner = new ReadSensors4Partner();
-//        ArrayList<String> outputValue = null;
-//        try {
-//            outputValue = (readSensors4Partner.FetchSensor4Box(companyName,token));
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        }
-//        String workingArray = String.valueOf(outputValue).replace("[{","{").replace("}]","}");
-//        JSONArray jsonArray = new JSONArray(workingArray);
-//
-//        HashMap<String, Double> sensors = new HashMap<String, Double>();
-//        for(int j = 0; j<jsonArray.length(); j++) {
-//            JSONObject jsonobject = jsonArray.getJSONObject(j);
-//            double value = jsonobject.getDouble("value");
-//            String sensorTag = jsonobject.getString("sensorTag");
-////            System.out.println(value);
-////            System.out.println(sensorTag);
-////            sensorsMap.setSensors(sensorTag,value);
-//            sensors.put(sensorTag,value);
-//
-//        }
-//
-//
-//    }
-
 }

src/main/java/eu/hsrw/ias/ggd/Isis.java

@@ -15,7 +15,7 @@ public class Isis {
     }
     public static void main(String args[]){
         try {
-            String output = OnCallMethod("Climate", "humidity");
+            String output = OnCallMethod("Greenhouse 1", "status");
             System.out.println(output);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/eu/hsrw/ias/ggd/MainExe.java

@@ -7,7 +7,7 @@ public class MainExe {
 
         Timer time = new Timer(); // Instantiate Timer Object
         ScheduledTask scheduledTask = new ScheduledTask(); // Instantiate SheduledTask class
-        time.schedule(scheduledTask, 0, 1000 * 30 * 1  ); // Create Repetitively task for every 2 min
+        time.schedule(scheduledTask, 0, 1000 * 60 * 5  ); // Create Repetitively task for every 2 min
     }
 
 }

src/main/java/eu/hsrw/ias/ggd/ScheduledTask.java

@@ -1,6 +1,5 @@
 package eu.hsrw.ias.ggd;
 
-import eu.hsrw.ias.ggd.ApiCall;
 import org.kie.api.KieServices;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
@@ -16,7 +15,7 @@ import java.util.concurrent.TimeoutException;
 public class ScheduledTask extends TimerTask {
 
     Date now; // to display current time
-    HashMap<String, Double> outputDevices ;
+    HashMap<String, SensorData> outputDevices ;
 
     // Add your task here
     public void run() {

src/main/java/eu/hsrw/ias/ggd/SecurityToken.java

@@ -12,12 +12,8 @@ public class SecurityToken {
         String baseURL = "https://api.whysor.com/users/login";
         final String body = String.format("{\"email\": \"%s\", \"password\": \"%s\", \"domain\": \"my.yookr.org\"}", username, password);
         HttpPost httpMethodPost = new HttpPost();
-
         return httpMethodPost.HttpCallPost(baseURL, body);
     }
-
-
-
 }
 
 

src/main/java/eu/hsrw/ias/ggd/SensorData.java

@@ -0,0 +1,28 @@
+package eu.hsrw.ias.ggd;
+
+public class SensorData {
+
+    private String sensorId;
+    private double value;
+
+    public SensorData(String sensorId, double value) {
+        this.sensorId = sensorId;
+        this.value = value;
+    }
+
+    public String getSensorTag() {
+        return sensorId;
+    }
+
+    public void setSensorTag(String sensorTag) {
+        this.sensorId = sensorTag;
+    }
+
+    public double getValue() {
+        return value;
+    }
+
+    public void setValue(double value) {
+        this.value = value;
+    }
+}

src/main/java/eu/hsrw/ias/ggd/SensorMap.java

@@ -0,0 +1,17 @@
+package eu.hsrw.ias.ggd;
+
+import java.util.HashMap;
+
+public class SensorMap {
+    private HashMap<String, Double> sensors = new HashMap<String, Double>();
+
+    public HashMap<String, Double> getSensors() {
+        return sensors;
+    }
+
+    public void setSensors(HashMap<String, Double> sensors) {
+        this.sensors = sensors;
+    }
+
+
+}