magnus/smon
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases 6 Packages Wiki Activity

Added groups for datapoints

Browse source
This commit is contained in:
Magnus Åhall 2024-05-20 19:40:19 +02:00
parent 63956de837
commit d3d6d5d13d
7 changed files with 48 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
datapoint.go
View file

@ -22,6 +22,7 @@ const (
type Datapoint struct {
ID int
Group string
Name string
Datatype DatapointType
LastValue time.Time `db:"last_value"`
@ -70,14 +71,16 @@ func (dp Datapoint) Update() (err error) {// {{{
if dp.ID == 0 {
_, err = service.Db.Conn.Exec(
`INSERT INTO datapoint(name, datatype) VALUES($1, $2)`,
`INSERT INTO datapoint("group", name, datatype) VALUES($1, $2, $3)`,
dp.Group,
name,
dp.Datatype,
)
} else {
_, err = service.Db.Conn.Exec(
`UPDATE datapoint SET name=$2, datatype=$3 WHERE id=$1`,
`UPDATE datapoint SET "group"=$2, name=$3, datatype=$4 WHERE id=$1`,
dp.ID,
dp.Group,
name,
dp.Datatype,
)
@ -131,6 +134,7 @@ func DatapointsRetrieve() (dps []Datapoint, err error) { // {{{
dp.name,
dp.datatype,
dp.last_value,
dp.group,
dpv.id AS v_id,
dpv.ts,
@ -146,6 +150,7 @@ func DatapointsRetrieve() (dps []Datapoint, err error) { // {{{
FROM datapoint_value
) dpv ON dpv.datapoint_id = dp.id AND rn = 1
ORDER BY
dp.group ASC,
dp.name ASC
`)
if err != nil {
@ -155,6 +160,7 @@ func DatapointsRetrieve() (dps []Datapoint, err error) { // {{{
type DbRes struct {
ID int
Group string
Name string
Datatype DatapointType
LastValue time.Time `db:"last_value"`
@ -178,6 +184,7 @@ func DatapointsRetrieve() (dps []Datapoint, err error) { // {{{
dp.ID = res.ID
dp.Name = res.Name
dp.Group = res.Group
dp.Datatype = res.Datatype
dp.LastValue = res.LastValue
dp.Found = true