add car powermeter
This commit is contained in:
@@ -51,12 +51,12 @@ steps:
|
|||||||
settings:
|
settings:
|
||||||
repo: ${FORGE_NAME}/${CI_REPO}
|
repo: ${FORGE_NAME}/${CI_REPO}
|
||||||
registry:
|
registry:
|
||||||
from_secret: container_registry
|
from_secret: local_registry
|
||||||
tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
|
tags: latest,${CI_COMMIT_SHA},${CI_COMMIT_TAG}
|
||||||
username:
|
username:
|
||||||
from_secret: container_registry_username
|
from_secret: local_username
|
||||||
password:
|
password:
|
||||||
from_secret: container_registry_password
|
from_secret: local_password
|
||||||
dockerfile: Dockerfile
|
dockerfile: Dockerfile
|
||||||
when:
|
when:
|
||||||
- event: [push, tag]
|
- event: [push, tag]
|
||||||
|
|||||||
@@ -62,6 +62,16 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"topics": [ "IoT/Car/Values" ],
|
||||||
|
"handler": "Car",
|
||||||
|
"id": "Car",
|
||||||
|
"config": {
|
||||||
|
"databaseConnStr": "",
|
||||||
|
"attributes": {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"topics": [ "locative/event/#" ],
|
"topics": [ "locative/event/#" ],
|
||||||
"handler": "Locative",
|
"handler": "Locative",
|
||||||
|
|||||||
@@ -1,25 +1,27 @@
|
|||||||
package dispatcher
|
package dispatcher
|
||||||
|
|
||||||
import "log"
|
import (
|
||||||
import "time"
|
"fmt"
|
||||||
import "os"
|
"log"
|
||||||
import "fmt"
|
"net/url"
|
||||||
import "net/url"
|
"os"
|
||||||
import "udi/mqtt"
|
"time"
|
||||||
import "udi/config"
|
"udi/config"
|
||||||
import "udi/counter"
|
"udi/counter"
|
||||||
import "udi/handlers/handler"
|
"udi/handlers/car"
|
||||||
import "udi/handlers/ttn"
|
"udi/handlers/dt1t"
|
||||||
import "udi/handlers/iot"
|
"udi/handlers/handler"
|
||||||
import "udi/handlers/pv"
|
"udi/handlers/iot"
|
||||||
import "udi/handlers/mbgw3"
|
"udi/handlers/locative"
|
||||||
import "udi/handlers/sver"
|
"udi/handlers/mbgw3"
|
||||||
import "udi/handlers/svej"
|
"udi/handlers/prepared"
|
||||||
import "udi/handlers/dt1t"
|
"udi/handlers/pv"
|
||||||
import "udi/handlers/locative"
|
"udi/handlers/svej"
|
||||||
import "udi/handlers/prepared"
|
"udi/handlers/sver"
|
||||||
import "udi/handlers/z2m"
|
"udi/handlers/ttn"
|
||||||
|
"udi/handlers/z2m"
|
||||||
|
"udi/mqtt"
|
||||||
|
)
|
||||||
|
|
||||||
var handlerMap map[string]handler.Handler = make(map[string]handler.Handler)
|
var handlerMap map[string]handler.Handler = make(map[string]handler.Handler)
|
||||||
var archiverChannel chan handler.MessageT = make(chan handler.MessageT, 100)
|
var archiverChannel chan handler.MessageT = make(chan handler.MessageT, 100)
|
||||||
@@ -53,13 +55,15 @@ func InitDispatcher() {
|
|||||||
factory = prepared.New
|
factory = prepared.New
|
||||||
case "Z2M":
|
case "Z2M":
|
||||||
factory = z2m.New
|
factory = z2m.New
|
||||||
|
case "Car":
|
||||||
|
factory = car.New
|
||||||
default:
|
default:
|
||||||
factory = nil
|
factory = nil
|
||||||
log.Printf("No handler %s found, ignore mapping", mapping.Handler)
|
log.Printf("No handler %s found, ignore mapping", mapping.Handler)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn, ok := factory.(func(string, config.HandlerConfigT) handler.Handler)
|
fn, ok := factory.(func(string, config.HandlerConfigT) handler.Handler)
|
||||||
if ! ok {
|
if !ok {
|
||||||
log.Println("Typ Assertion failed")
|
log.Println("Typ Assertion failed")
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
@@ -71,7 +75,7 @@ func InitDispatcher() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func storeMessage(filename string, item handler.MessageT) {
|
func storeMessage(filename string, item handler.MessageT) {
|
||||||
file, err := os.OpenFile(filename, os.O_APPEND | os.O_CREATE | os.O_WRONLY, 0644)
|
file, err := os.OpenFile(filename, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Printf("Unable to open archiving file %s, message is not archived: %s", filename, err)
|
log.Printf("Unable to open archiving file %s, message is not archived: %s", filename, err)
|
||||||
counter.F("Archived")
|
counter.F("Archived")
|
||||||
@@ -95,7 +99,7 @@ func archiver() {
|
|||||||
|
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case message := <- archiverChannel:
|
case message := <-archiverChannel:
|
||||||
currentDateStr := message.Timestamp.Format("2006/01/02/15")
|
currentDateStr := message.Timestamp.Format("2006/01/02/15")
|
||||||
currentArchivingDir := archivingRootDir + "/" + currentDateStr
|
currentArchivingDir := archivingRootDir + "/" + currentDateStr
|
||||||
if currentArchivingDir != lastArchivingDir {
|
if currentArchivingDir != lastArchivingDir {
|
||||||
@@ -116,9 +120,9 @@ func archiver() {
|
|||||||
func InputDispatcher() {
|
func InputDispatcher() {
|
||||||
for {
|
for {
|
||||||
select {
|
select {
|
||||||
case mqttMessage := <- mqtt.InputChannel:
|
case mqttMessage := <-mqtt.InputChannel:
|
||||||
//log.Printf("Message arrived in inputDispatcher, topic: %s\n", mqttMessage.Topic)
|
//log.Printf("Message arrived in inputDispatcher, topic: %s\n", mqttMessage.Topic)
|
||||||
message := handler.MessageT { time.Now(), mqttMessage.Topic, string(mqttMessage.Payload) }
|
message := handler.MessageT{time.Now(), mqttMessage.Topic, string(mqttMessage.Payload)}
|
||||||
archiverChannel <- message
|
archiverChannel <- message
|
||||||
handleMessage(message)
|
handleMessage(message)
|
||||||
}
|
}
|
||||||
|
|||||||
94
src/udi/handlers/car/car.go
Normal file
94
src/udi/handlers/car/car.go
Normal file
@@ -0,0 +1,94 @@
|
|||||||
|
package car
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"log"
|
||||||
|
"reflect"
|
||||||
|
"time"
|
||||||
|
"udi/config"
|
||||||
|
"udi/database"
|
||||||
|
"udi/handlers/handler"
|
||||||
|
)
|
||||||
|
|
||||||
|
type CarHandler struct {
|
||||||
|
handler.CommonHandler
|
||||||
|
dbh *database.DatabaseHandle
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
{
|
||||||
|
"status": "Ok",
|
||||||
|
"timestamp": "2025-12-15T13:11:15.648243",
|
||||||
|
"voltageL1": 228.68,
|
||||||
|
"voltageL2": 227.69,
|
||||||
|
"voltageL3": 228.53,
|
||||||
|
"currentL1": 0.0,
|
||||||
|
"currentL2": 0.0,
|
||||||
|
"currentL3": 0.0,
|
||||||
|
"powerL1": 0.0,
|
||||||
|
"powerL2": 0.0,
|
||||||
|
"powerL3": 0.0,
|
||||||
|
"totalImportEnergy": 0.0,
|
||||||
|
"totalExportEnergy": 0.0,
|
||||||
|
"cnt": 399300}
|
||||||
|
*/
|
||||||
|
|
||||||
|
type CarValue struct {
|
||||||
|
Status string `unit:"" json:"status"`
|
||||||
|
Timestamp string `unit:"" json:"timestamp"`
|
||||||
|
VoltageL1 float32 `unit:"V" json:"voltageL1"`
|
||||||
|
VoltageL2 float32 `unit:"V" json:"voltageL2"`
|
||||||
|
VoltageL3 float32 `unit:"V" json:"voltageL3"`
|
||||||
|
CurrentL1 float32 `unit:"A" json:"currentL1"`
|
||||||
|
CurrentL2 float32 `unit:"A" json:"currentL2"`
|
||||||
|
CurrentL3 float32 `unit:"A" json:"currentL3"`
|
||||||
|
PowerL1 float32 `unit:"W" json:"powerL1"`
|
||||||
|
PowerL2 float32 `unit:"W" json:"powerL2"`
|
||||||
|
PowerL3 float32 `unit:"W" json:"powerL3"`
|
||||||
|
TotalImportEnergy float32 `unit:"Wh" json:"totalImportEnergy"`
|
||||||
|
TotalExportEnergy float32 `unit:"Wh" json:"totalExportEnergy"`
|
||||||
|
Cnt int `unit:"" json:"cnt"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func New(id string, config config.HandlerConfigT) handler.Handler {
|
||||||
|
t := &CarHandler{}
|
||||||
|
t.Id = id
|
||||||
|
t.dbh = database.NewDatabaseHandle()
|
||||||
|
log.Printf("Handler Car %d initialized", id)
|
||||||
|
return t
|
||||||
|
}
|
||||||
|
|
||||||
|
func (self *CarHandler) Handle(message handler.MessageT) {
|
||||||
|
//log.Printf("Handler Car %d processing %s -> %s", self.id, message.Topic, message.Payload)
|
||||||
|
|
||||||
|
var carValue CarValue
|
||||||
|
err := json.Unmarshal([]byte(message.Payload), &carValue)
|
||||||
|
if err != nil {
|
||||||
|
self.Lost("Unable to parse payload into carValue struct", err, message)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
variables := make(map[string]database.VariableType)
|
||||||
|
carValueStructValue := reflect.ValueOf(carValue)
|
||||||
|
for i := 0; i < carValueStructValue.NumField(); i++ {
|
||||||
|
field := carValueStructValue.Type().Field(i)
|
||||||
|
fieldValue := carValueStructValue.Field(i)
|
||||||
|
v := database.VariableType{
|
||||||
|
Label: "",
|
||||||
|
Variable: field.Name,
|
||||||
|
Unit: field.Tag.Get("unit"),
|
||||||
|
Value: fieldValue.Interface(),
|
||||||
|
}
|
||||||
|
variables[field.Name] = v
|
||||||
|
}
|
||||||
|
|
||||||
|
measurement := database.Measurement{
|
||||||
|
Time: time.Now(),
|
||||||
|
Application: "Car",
|
||||||
|
Device: "Powermeter",
|
||||||
|
Values: variables,
|
||||||
|
}
|
||||||
|
|
||||||
|
self.dbh.StoreMeasurement(&measurement)
|
||||||
|
self.S()
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user