Merge pull request #15 from xprojects-de/development

Adding BusInfo to Remote-Device

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>x</groupId>
   <artifactId>Alpdesk-Automationservice</artifactId>
-  <version>2.2.7</version>
+  <version>2.2.8</version>
 
   <packaging>jar</packaging>
 

src/main/java/x/DeviceUtils/DeviceListUtils.java

@@ -22,6 +22,7 @@ public class DeviceListUtils {
   private int maxInputBusaddress = -1;
   private int maxOutputBusaddress = -1;
   private int maxAnalogInBusaddress = -1;
+  private String lastBusUpdate = "";
 
   private static DeviceListUtils singleton = null;
 
@@ -43,6 +44,14 @@ public List<BaseDevice> getDeviceList() {
     return this.deviceList;
   }
 
+  public String getLastBusUpdate() {
+    return lastBusUpdate;
+  }
+
+  public void setLastBusUpdate(String lastBusUpdate) {
+    this.lastBusUpdate = lastBusUpdate;
+  }
+
   public ArrayList<InputDevice> getInputDevicesByCategorie(String categorie) {
     ArrayList<InputDevice> list = new ArrayList<>();
     for (Object device : deviceList) {

src/main/java/x/DeviceUtils/Types.java

@@ -2,6 +2,8 @@
 
 public class Types {
 
+  public static final int TYPE_SYSTEMINFO = 100000;
+
   public static final int TYPE_INPUT = 1000;
   public static final int TYPE_OUTPUT = 2000;
   public static final int TYPE_TEMPERATURE = 3000;

src/main/java/x/bus/BaseBus.java

@@ -1,6 +1,7 @@
 package x.bus;
 
 import java.lang.reflect.Field;
+import java.text.SimpleDateFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import x.DeviceUtils.DeviceListUtils;
@@ -11,10 +12,12 @@
 import x.utils.FieldParser;
 import x.utils.PropertyInfo;
 import x.websocket.model.AsyncStatusMessage;
+import java.util.Calendar;
 
 public class BaseBus {
 
   private final Logger logger = LoggerFactory.getLogger(BaseBus.class);
+  private SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 
   public void start() {
 
@@ -71,6 +74,14 @@ public void updateDeviceHandleStatusForWebSocket(int cycleTime, long elapsedTime
         }
       }
     }
+
     MessageHandler.getInstance().messageToWebSocketClients(globalASM);
+
+    try {
+      DeviceListUtils.getInstance().setLastBusUpdate(dateFormat.format(Calendar.getInstance().getTime()));
+    } catch (Exception e) {
+      DeviceListUtils.getInstance().setLastBusUpdate("-");
+    }
+
   }
 }

src/main/java/x/main/XHomeautomationMain.java

@@ -31,7 +31,7 @@ public class XHomeautomationMain implements ApplicationRunner {
 
   Logger logger = LoggerFactory.getLogger(XHomeautomationMain.class);
 
-  public static final String VERSION = "2.2.7";
+  public static final String VERSION = "2.2.8";
 
   @Autowired
   RetainProcess retainProcess;

src/main/java/x/utils/RemoteAccessRequest.java

@@ -58,11 +58,36 @@ private void getStatefulDeviceProperties(Object deviceHandleObject, int deviceHa
     }
   }
 
+  private void addSystemInfo(AutomationRequestParams atRequestParams) {
+
+    HashMap<Object, Object> busInfoMap = new HashMap<>();
+    busInfoMap.put("type", Types.TYPE_SYSTEMINFO);
+    busInfoMap.put("categorie", "System");
+    busInfoMap.put("name", "Systeminfo");
+
+    ArrayList<Object> list = new ArrayList<>();
+    HashMap<Object, Object> m = new HashMap<>();
+    m.put("handle", 0);
+    m.put("displayName", "Last Busupdate");
+    m.put("value", DeviceListUtils.getInstance().getLastBusUpdate());
+    m.put("stateful", false);
+    m.put("editable", false);
+    list.add(0, m);
+    busInfoMap.put("properties", list);
+
+    atRequestParams.getParams().put((Types.TYPE_SYSTEMINFO * -1), busInfoMap);
+  }
+
   private AutomationRequest generateCommitMessage() {
+
     AutomationRequest atRequest = new AutomationRequest();
     atRequest.setPlugin("automation");
+
     AutomationRequestParams atRequestParams = new AutomationRequestParams();
     atRequestParams.setMethod("commit");
+
+    addSystemInfo(atRequestParams);
+
     for (Object deviceHandle : DeviceListUtils.getInstance().getDeviceList()) {
       HashMap<Object, Object> tmpMap = new HashMap<>();
       if (deviceHandle instanceof OutputDevice) {