5GPowerQuality/parser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for seperate meters

Browse Source
This commit is contained in:
Nise Void 2018-06-07 13:44:05 +02:00
parent 810992c368
commit 6643217fdb
Signed by: NiseVoid
GPG Key ID: FBA14AC83EA602F3
4 changed files with 132 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/migrations/files/0004.sql Normal file
View File

@ -0,0 +1,10 @@
CREATE TABLE meter (
id serial PRIMARY KEY NOT NULL,
name varchar(255) NOT NULL,
fortop_uid varchar(50) NOT NULL
);
DELETE FROM measurement;
ALTER TABLE measurement
ADD meter_id integer NOT NULL;

92
internal/model/db.json
View File

@ -4,136 +4,140 @@
"fields": [ "fields": [
{ {
"name": "c_gem_1", "name": "c_gem_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "c_gem_2", "name": "c_gem_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "c_gem_3", "name": "c_gem_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "ep_1", "name": "ep_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "ep_2", "name": "ep_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "ep_3", "name": "ep_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_gem_1", "name": "i_gem_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_gem_2", "name": "i_gem_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_gem_3", "name": "i_gem_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_max_1", "name": "i_max_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_max_2", "name": "i_max_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "i_max_3", "name": "i_max_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{
"name": "meter_id",
"data_type": "integer",
"size": 4
},
{ {
"name": "p_max_1", "name": "p_max_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "p_max_2", "name": "p_max_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "p_max_3", "name": "p_max_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "s_max_1", "name": "s_max_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "s_max_2", "name": "s_max_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "s_max_3", "name": "s_max_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "time", "name": "time",
"type": "timestamp with time zone", "data_type": "timestamp with time zone",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "u_gem_1", "name": "u_gem_1",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "u_gem_2", "name": "u_gem_2",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
}, },
{ {
"name": "u_gem_3", "name": "u_gem_3",
"type": "double precision", "data_type": "double precision",
"null": false,
"size": 8 "size": 8
} }
] ]
},
{
"name": "public.meter",
"alias": "me",
"fields": [
{
"name": "fortop_uid",
"data_type": "character varying",
"size": 50
},
{
"name": "id",
"data_type": "integer",
"size": 4
},
{
"name": "name",
"data_type": "character varying",
"size": 255
}
]
} }
] ]

91
main.go
View File

@ -10,7 +10,9 @@ import (
"git.fuyu.moe/5GPowerQuality/parser/internal/model" "git.fuyu.moe/5GPowerQuality/parser/internal/model"
"git.fuyu.moe/Fuyu/flog" "git.fuyu.moe/Fuyu/flog"
"git.ultraware.nl/NiseVoid/qb"
"git.ultraware.nl/NiseVoid/qb/qbdb" "git.ultraware.nl/NiseVoid/qb/qbdb"
"git.ultraware.nl/NiseVoid/qb/qc"
"git.ultraware.nl/NiseVoid/qb/qf" "git.ultraware.nl/NiseVoid/qb/qf"
"golang.org/x/net/html/charset" "golang.org/x/net/html/charset"
) )
@ -50,22 +52,31 @@ func fetchData() {
end := start.Add(time.Hour) end := start.Add(time.Hour)
data := GetFortopData(start, end) data := GetFortopData(start, end)
ranges := map[string][]Range{} ranges := map[int]map[string][]Range{}
for _, v := range data { for _, meter := range data {
ranges[v.Naam] = v.Range mID := GetMeterID(meter.MeterID)
ranges[mID] = map[string][]Range{}
for _, v := range meter.Meetwaarde {
ranges[mID][v.Naam] = v.Range
}
} }
sets := Sets{} sets := map[int]Sets{}
for k, v := range ranges { for meter, val := range ranges {
for _, r := range v { sets[meter] = Sets{}
date := time.Time(r.Date)
set, ok := sets[date]
if !ok {
sets[date] = Set{}
set = sets[date]
}
set[k] = r.Value for k, v := range val {
for _, r := range v {
date := time.Time(r.Date)
set, ok := sets[meter][date]
if !ok {
sets[meter][date] = Set{}
set = sets[meter][date]
}
set[k] = r.Value
}
} }
} }
@ -81,6 +92,30 @@ func fetchData() {
start = GetStartDate() start = GetStartDate()
} }
// GetMeterID gets the meter ID, if there is none yet a new record is add to meter
func GetMeterID(meterID string) (id int) {
me := model.Meter()
q := me.Select(me.ID).
Where(qc.Eq(me.FortopUID, meterID))
err := db.QueryRow(q).Scan(&id)
switch err {
case nil:
case sql.ErrNoRows:
iq := me.Insert(me.Name, me.FortopUID).
Values(``, meterID)
err = db.QueryRow(qb.Returning(iq, me.ID)).Scan(&id)
if err != nil {
panic(err)
}
default:
panic(err)
}
return
}
// GetStartDate gets the last measurement date // GetStartDate gets the last measurement date
func GetStartDate() time.Time { func GetStartDate() time.Time {
m := model.Measurement() m := model.Measurement()
@ -100,13 +135,13 @@ func GetStartDate() time.Time {
return *t return *t
} }
func insertSets(sets Sets) { func insertSets(sets map[int]Sets) {
if len(sets) == 0 { if len(sets) == 0 {
return return
} }
m := model.Measurement() m := model.Measurement()
q := m.Insert(m.Time, q := m.Insert(m.Time, m.MeterID,
m.CGem1, m.CGem2, m.CGem3, m.CGem1, m.CGem2, m.CGem3,
m.Ep1, m.Ep2, m.Ep3, m.Ep1, m.Ep2, m.Ep3,
m.IGem1, m.IGem2, m.IGem3, m.IGem1, m.IGem2, m.IGem3,
@ -116,16 +151,18 @@ func insertSets(sets Sets) {
m.UGem1, m.UGem2, m.UGem3, m.UGem1, m.UGem2, m.UGem3,
) )
for k, v := range sets { for meter, s := range sets {
q.Values(k, for k, v := range s {
v[`CGem1`], v[`CGem2`], v[`CGem3`], q.Values(k, meter,
v[`EP1`], v[`EP2`], v[`EP3`], v[`CGem1`], v[`CGem2`], v[`CGem3`],
v[`IGem1`], v[`IGem2`], v[`IGem3`], v[`EP1`], v[`EP2`], v[`EP3`],
v[`IMax1`], v[`IMax2`], v[`IMax3`], v[`IGem1`], v[`IGem2`], v[`IGem3`],
v[`PMax1`], v[`PMax2`], v[`PMax3`], v[`IMax1`], v[`IMax2`], v[`IMax3`],
v[`SMax1`], v[`SMax2`], v[`SMax3`], v[`PMax1`], v[`PMax2`], v[`PMax3`],
v[`UGem1`], v[`UGem2`], v[`UGem3`], v[`SMax1`], v[`SMax2`], v[`SMax3`],
) v[`UGem1`], v[`UGem2`], v[`UGem3`],
)
}
} }
err := db.Exec(q) err := db.Exec(q)
@ -135,7 +172,7 @@ func insertSets(sets Sets) {
} }
// GetFortopData retrieves data from fortop // GetFortopData retrieves data from fortop
func GetFortopData(startDate, endDate time.Time) []Meetwaarde { func GetFortopData(startDate, endDate time.Time) []Meter {
url := `https://energy4all.energyportal.online/index?p5g=S_1_` + strconv.FormatInt(startDate.Unix(), 10) + `_` + strconv.FormatInt(endDate.Unix(), 10) url := `https://energy4all.energyportal.online/index?p5g=S_1_` + strconv.FormatInt(startDate.Unix(), 10) + `_` + strconv.FormatInt(endDate.Unix(), 10)
resp, err := http.Get(url) resp, err := http.Get(url)
if err != nil { if err != nil {
@ -155,5 +192,5 @@ func GetFortopData(startDate, endDate time.Time) []Meetwaarde {
panic(err) panic(err)
} }
return data.Trafo.Meter.Meetwaarde return data.Trafo.Meter
} }

17
type.go
View File

@ -10,16 +10,19 @@ import (
type FortopFormat struct { type FortopFormat struct {
XMLName xml.Name `xml:"Trafo-Details"` XMLName xml.Name `xml:"Trafo-Details"`
Trafo struct { Trafo struct {
TrafoNummer int `xml:"trafonummer"` TrafoNummer int `xml:"trafonummer"`
Meter struct { Meter []Meter `xml:"meter"`
MeterID int `xml:"meter-id"`
StartDate UnixTimestamp `xml:"startdate"`
EndDate int `xml:"enddate"`
Meetwaarde []Meetwaarde `xml:"meetwaarde"`
} `xml:"meter"`
} `xml:"trafo"` } `xml:"trafo"`
} }
// Meter contains all data from one specific meter
type Meter struct {
MeterID string `xml:"meter-id"`
StartDate UnixTimestamp `xml:"startdate"`
EndDate UnixTimestamp `xml:"enddate"`
Meetwaarde []Meetwaarde `xml:"meetwaarde"`
}
// Meetwaarde contains the data that is not pointless garbage // Meetwaarde contains the data that is not pointless garbage
type Meetwaarde struct { type Meetwaarde struct {
Naam string `xml:"naam"` Naam string `xml:"naam"`