You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by er...@apache.org on 2020/05/08 08:23:40 UTC

[plc4x] branch feature/scraper updated: SCRAPER -EipField --> added getDefaultJavaType -Tested Scraper with EIP --> worked using generic Trigger (but no real code difference)

This is an automated email from the ASF dual-hosted git repository.

erobinet pushed a commit to branch feature/scraper
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/feature/scraper by this push:
     new 2ef6adf  SCRAPER -EipField -->  added getDefaultJavaType -Tested Scraper with EIP --> worked using  generic Trigger (but no real code difference)
2ef6adf is described below

commit 2ef6adf8052b23eeccd1479e39e45274fb34c598
Author: etiennerobinet <61...@users.noreply.github.com>
AuthorDate: Fri May 8 10:17:57 2020 +0200

    SCRAPER
    -EipField -->  added getDefaultJavaType
    -Tested Scraper with EIP --> worked using  generic Trigger (but no real code difference)
---
 .../plc4x/java/eip/readwrite/field/EipField.java   | 21 +++++++++++++
 .../eip/readwrite/protocol/EipProtocolLogic.java   |  5 +++
 .../triggerhandler/TriggerConfiguration.java       |  4 +--
 .../triggerhandler/TriggerHandlerImpl.java         | 36 ++++++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/field/EipField.java b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/field/EipField.java
index 4a8abbc..de738b2 100644
--- a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/field/EipField.java
+++ b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/field/EipField.java
@@ -109,4 +109,25 @@ public class EipField implements PlcField {
         }
         return null;
     }
+
+    @Override
+    public Class<?> getDefaultJavaType() {
+        switch (type){
+            //ToDo differenciate Short, Integer and Long
+            case INT:
+            case DINT:
+            case SINT:
+            case LINT:
+                return java.lang.Integer.class;
+            case STRING:
+            case STRING36:
+                return java.lang.String.class;
+            case REAL:
+                return java.lang.Double.class;
+            case BOOL:
+                return java.lang.Boolean.class;
+            default:
+                return Object.class;
+        }
+    }
 }
diff --git a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/protocol/EipProtocolLogic.java b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/protocol/EipProtocolLogic.java
index b0061ca..6030f55 100644
--- a/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/protocol/EipProtocolLogic.java
+++ b/plc4j/drivers/eip/src/main/java/org/apache/plc4x/java/eip/readwrite/protocol/EipProtocolLogic.java
@@ -338,6 +338,9 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
                         list.add(new PlcDouble(swap(data.getFloat(index))));
                         index += type.getSize();
                         break;
+                    case BOOL:
+                        list.add(new PlcBoolean(data.getBoolean(index)));
+                        index+= type.getSize();
                     default:
                         return null;
                 }
@@ -353,6 +356,8 @@ public class EipProtocolLogic extends Plc4xProtocolBase<EipPacket> implements Ha
                     return new PlcInteger(Integer.reverseBytes(data.getInt(0)));
                 case REAL:
                     return new PlcDouble(swap(data.getFloat(0)));
+                case BOOL:
+                    return new PlcBoolean(data.getBoolean(0));
                 default:
                     return null;
             }
diff --git a/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java b/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
index 7b64422..3390432 100644
--- a/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
+++ b/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerConfiguration.java
@@ -77,7 +77,7 @@ public class TriggerConfiguration{
 
         String exceptionMessage;
 
-        if(this.triggerType.equals(TriggerType.S7_TRIGGER_VAR)) {
+        if(this.triggerType.equals(TriggerType.S7_TRIGGER_VAR) ||this.triggerType.equals(TriggerType.TRIGGER_VAR) ) {
             //test for valid field-connection string, on exception quit job and return message to user
             if(this.triggerElementList.isEmpty()){
                 exceptionMessage = String.format("No items in trigger List for trigger-type S7_TRIGGER_VAR for Job %s!", triggeredScrapeJobImpl.getJobName());
@@ -423,7 +423,7 @@ public class TriggerConfiguration{
                     }
 
                     //ToDo add clever Strategy to concat more than two conditions if needed
-                    return new TriggerConfiguration(TriggerType.S7_TRIGGER_VAR,scheduledMs,triggerElements,triggeredScrapeJob);
+                    return new TriggerConfiguration(TriggerType.TRIGGER_VAR,scheduledMs,triggerElements,triggeredScrapeJob);
                 case SCHEDULED:
                     if(triggerVar !=null || comparatorString!=null || comparatorVariable!=null){
                         throw new ScraperConfigurationException("SCHEDULED trigger strategy must only be used with scheduled interval - nothing more!  given configString: "+jobTriggerStrategy);
diff --git a/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java b/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
index 6a2c551..7642bf1 100644
--- a/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
+++ b/plc4j/tools/scraper/src/main/java/org/apache/plc4x/java/scraper/triggeredscraper/triggerhandler/TriggerHandlerImpl.java
@@ -65,6 +65,8 @@ public class TriggerHandlerImpl implements TriggerHandler {
                 return true;
             case S7_TRIGGER_VAR:
                 return checkS7TriggerVariable();
+            case TRIGGER_VAR:
+                return checkGenericTrigger();
             default:
                 //should not happen
                 return false;
@@ -110,4 +112,38 @@ public class TriggerHandlerImpl implements TriggerHandler {
 
     }
 
+    private boolean checkGenericTrigger(){
+        List<Object> acquiredValuesList = new ArrayList<>();
+        for(TriggerConfiguration.TriggerElement triggerElement:triggerConfiguration.getTriggerElementList()){
+            try {
+                Object result = triggerCollector.requestResult(triggerElement.getUuid());
+                if(result==null){
+                    return false;
+                }
+                acquiredValuesList.add(result);
+            } catch (ScraperException e) {
+                LOGGER.warn("Went wrong",e);
+            }
+        }
+
+        //check if trigger condition from TriggerConfiguration is fulfilled
+        boolean trigger = false;
+        try {
+            trigger = triggerConfiguration.evaluateTrigger(acquiredValuesList);
+        } catch (ScraperException e) {
+            LOGGER.warn("Could not evaluate trigger");
+        }
+
+        //only trigger scraping of data on rising edge of trigger
+        if(trigger && !this.lastTriggerState){
+            this.lastTriggerState = true;
+            return true;
+        }
+        else{
+            this.lastTriggerState = trigger;
+            return false;
+        }
+
+    }
+
 }