v2.3.2 - Structure parsing logic

MickMake · Oct 22, 2022 · 154951f · 154951f
1 parent 371e2d6
commit 154951f
Show file tree

Hide file tree

Showing 21 changed files with 1,287 additions and 956 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/iSolarCloud/AppService/findPsType/data.go b/iSolarCloud/AppService/findPsType/data.go
@@ -46,7 +46,7 @@ func (e *EndPoint) GetData() api.DataMap {
 	for range Only.Once {
 		pkg := apiReflect.GetName("", *e)
 		dt := valueTypes.NewDateTime(valueTypes.Now)
-		entries.StructToPoints(e.Response.ResultData, pkg, "", dt)
+		entries.StructToPoints(e.Response.ResultData, pkg, e.Request.PsId.String(), dt)
 
 		// for _, d := range e.Response.ResultData {
 		// 	name := fmt.Sprintf("%s.%s", pkg, e.Request.PsId.String())

diff --git a/iSolarCloud/AppService/getAllDeviceByPsId/data.go b/iSolarCloud/AppService/getAllDeviceByPsId/data.go
@@ -47,7 +47,8 @@ func (e *EndPoint) GetData() api.DataMap {
 	for range Only.Once {
 		pkg := apiReflect.GetName("", *e)
 		dt := valueTypes.NewDateTime(valueTypes.Now)
-		entries.StructToPoints(e.Response.ResultData, pkg, "", dt)
+		name := pkg + "." + e.Request.PsId.String()
+		entries.StructToPoints(e.Response.ResultData, name, e.Request.PsId.String(), dt)
 	}
 
 	return entries

diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go
@@ -265,13 +265,8 @@ func (e *EndPoint) GetData() api.DataMap {
 	for range Only.Once {
 		pkg := apiReflect.GetName("", *e)
 		dt := valueTypes.NewDateTime(valueTypes.Now)
-		entries.StructToPoints(e.Response.ResultData, pkg, "", dt)
-
-		// pkg := apiReflect.GetName("", *e)
-		// for _, d := range e.Response.ResultData.PageList {
-		// 	name := api.JoinWithDots(0, valueTypes.DateTimeLayoutDay, pkg, d.PsKey)
-		// 	entries.StructToPoints(d, name, e.Request.PsId.String(), valueTypes.NewDateTime(""))
-		// }
+		name := pkg + "." + e.Request.PsId.String()
+		entries.StructToPoints(e.Response.ResultData, name, e.Request.PsId.String(), dt)
 	}
 
 	return entries