Commit ccc195d3 authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia transform y script para nueva estructura 

Cada sensor va en un documento distinto en lugar de un array, por ese
motivo se ha cambiado la transformación de la estructura y el script
parent 47829981

src/scripts/groovy/processSimpleData.groovy

+8 −8
Original line number Diff line number Diff line
@@ -29,12 +29,6 @@ flowFile = session.write(flowFile, { inputStream, outputStream -> 
	// Read config from file

	def config = getConfigFile()



	// Set activity id from config

	inJson["activityId"] = config["activityId"]



	// Generate identifier

	inJson["id"] = generateIdentifier(config["activityId"], inJson["date"])



	def sensors = inJson["sensors"]

	def toRemove = []
@@ -59,6 +53,9 @@ flowFile = session.write(flowFile, { inputStream, outputStream -> 
				value = truncValue(value, decimalPlaces)

			}



			// Set activity id from config

			sensor["activityId"] = config["activityId"]



			sensor["value"] = value



			// qualityControl
@@ -66,6 +63,9 @@ flowFile = session.write(flowFile, { inputStream, outputStream -> 
			sensor["vFlag"] = realTimeVFlag



			sensor["dataDefinition"] = config[dataDefinition].dataDefinition



			// Generate identifier

			sensor["id"] = generateIdentifier(config["activityId"], sensor["dataDefinition"], sensor["date"])

		}

		else {

			toRemove.add(sensor)
@@ -85,9 +85,9 @@ def getConfigFile() { 
	return new JsonSlurper().parseText(configFile)

}



def generateIdentifier(activityId, dateTime) {

def generateIdentifier(activityId, dataDefinition, dateTime) {

	def time = Date.parse(dateFormat, dateTime)

	return activityId + "-" + time.getTime();

	return activityId + "-" + dataDefinition + "-" + time.getTime();

}



def transformValue(sensorValue, transform) {

src/scripts/jolt/createSimpleDataStructure

+10 −9
Original line number Diff line number Diff line 
[{

    "operation": "shift",

    "spec": {

      "id": "&",

      "date": "&",

      "id": "id",

      "date": "date",

      "*": "temp.&"

    }

  },

  {

    "operation": "shift",

    "spec": {

      "*": "&",

      "temp": {

        "*": {

          "@(2,id)": "sensors.[#2].id",

          "@(2,date)": "sensors.[#2].date",

          "$": "sensors.[#2].dataDefinition",

          "@": "sensors.[#2].value"

        }
@@ -21,18 +22,18 @@ 
  {

    "operation": "default",

    "spec": {

      "activityId": null,

      "featuresRelations": null,

      "sampleId": null,

      "inserted": null,

      "updated": null,

      "sensors[]": {

        "*": {

          "z": null,

          "deviation": null,

          "remark": null,

          "qFlag": null,

          "vFlag": null

          "vFlag": null,

          "activityId": null,

          "featuresRelations": null,

          "sampleId": null,

          "inserted": null,

          "updated": null

        }

      }

    }