diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 66b2afe4a..cd3592a85 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,962 +5,1972 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -1034,7 +2044,7 @@
-
+
@@ -1066,24 +2076,9 @@
165
-
- file://$PROJECT_DIR$/iSolarCloud/api/file.go
- 42
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/file.go
- 56
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/file.go
- 121
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 179
+ 185
@@ -1103,12 +2098,12 @@
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 312
+ 325
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 311
+ 324
@@ -1196,41 +2191,21 @@
327
-
- file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 382
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
- 364
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go
- 219
+ 213
file://$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go
- 175
+ 169
file://$PROJECT_DIR$/iSolarCloud/AppService/getPsDetailWithPsType/data.go
- 181
+ 175
-
- file://$PROJECT_DIR$/iSolarCloud/api/file.go
- 19
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/file.go
- 17
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/getDeviceModelInfoList/data.go
71
@@ -1253,12 +2228,7 @@
file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 237
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 326
+ 330
@@ -1316,14 +2286,9 @@
70
-
- file://$PROJECT_DIR$/iSolarCloud/AppService/getDeviceList/data.go
- 283
-
-
file://$PROJECT_DIR$/cmd/cmd_mqtt.go
- 356
+ 368
@@ -1333,12 +2298,12 @@
file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go
- 50
+ 51
file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 267
+ 382
@@ -1346,59 +2311,19 @@
76
-
- file://$PROJECT_DIR$/iSolarCloud/data.go
- 62
-
-
file://$PROJECT_DIR$/iSolarCloud/data.go
64
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_table.go
- 67
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_table.go
- 27
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/data.go
- 249
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/data.go
40
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_table.go
- 102
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 100
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
- 355
-
-
-
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
- 387
-
-
file://$PROJECT_DIR$/iSolarCloud/AppService/queryDeviceList/data.go
- 351
+ 355
@@ -1407,59 +2332,209 @@
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go
- 191
-
+ file://$PROJECT_DIR$/iSolarCloud/highlevel.go
+ 305
+
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/output/struct_table.go
- 194
-
+ file://$PROJECT_DIR$/iSolarCloud/AppService/queryMutiPointDataList/data.go
+ 196
+
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_data.go
- 399
-
+ file://$PROJECT_DIR$/iSolarCloud/AppService/getPowerDevicePointNames/data.go
+ 134
+
- file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_data.go
- 383
-
+ file://$PROJECT_DIR$/iSolarCloud/AppService/getDeviceTypeList/struct.go
+ 375
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 565
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 575
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 586
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 596
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 606
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/valueTypes/types.go
+ 641
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/reflection/funcs.go
+ 501
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 126
+
+
+
+ file://$PROJECT_DIR$/mmHa/binary_sensor.go
+ 34
+
+
+
+ file://$PROJECT_DIR$/cmd/cmd_mqtt.go
+ 453
+
+
+
+ file://$PROJECT_DIR$/cmd/cmd_mqtt.go
+ 424
+
+
+
+ file://$PROJECT_DIR$/mmHa/binary_sensor.go
+ 103
+
+
+
+ file://$PROJECT_DIR$/cmd/cmd_mqtt.go
+ 423
+
file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 72
-
+ 228
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 96
-
+ file://$PROJECT_DIR$/iSolarCloud/AppService/getPsList/data.go
+ 161
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/reflection/funcs.go
139
-
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 88
-
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 627
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 477
-
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 526
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_data.go
- 474
-
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 541
+
- file://$PROJECT_DIR$/iSolarCloud/api/struct_point.go
- 27
-
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 553
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 546
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 533
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 536
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 549
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 1014
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 1060
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 115
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 119
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 111
+
+
+
+ file://$PROJECT_DIR$/cmd/cmd_mqtt.go
+ 367
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 849
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 743
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 678
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 742
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 181
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/struct_reflect.go
+ 899
+
+
+
+ file://$PROJECT_DIR$/iSolarCloud/api/GoStruct/structmap.go
+ 150
+
@@ -1468,11 +2543,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/cmd/cmd_mqtt.go b/cmd/cmd_mqtt.go
index 7acba54cf..413c962e9 100644
--- a/cmd/cmd_mqtt.go
+++ b/cmd/cmd_mqtt.go
@@ -187,6 +187,19 @@ func (ca *Cmds) MqttArgs(cmd *cobra.Command, args []string) error {
break
}
+ ca.Error = ca.Mqtt.Mqtt.SetDeviceConfig(
+ ca.Mqtt.Mqtt.DeviceName,
+ ca.Mqtt.Mqtt.DeviceName,
+ "system",
+ "system",
+ "",
+ "",
+ "Roof",
+ )
+ if ca.Error != nil {
+ break
+ }
+
for _, psId := range ca.Mqtt.Mqtt.SungrowDevices {
// ca.Error = ca.Mqtt.Mqtt.SetDeviceConfig("GoSungrow", strconv.FormatInt(id, 10), "GoSungrow", model[0], "Sungrow", "Roof")
parent := psId.PsId.String()
@@ -345,13 +358,12 @@ func (ca *Cmds) MqttCron() error {
data.SetPsIds()
// All := []string{ "queryDeviceList", "getPsList", "getPsDetailWithPsType", "getPsDetail" }
- All := []string{ "getPsDetail" }
+ All := []string{ "queryDeviceList" }
data.SetEndpoints(All...)
ca.Error = data.GetData()
if ca.Error != nil {
break
}
- data.GetData()
for _, result := range data.GetResults() {
ca.Error = ca.Update(string(result.EndPointName), result.Response.Data, newDay)
@@ -360,20 +372,6 @@ func (ca *Cmds) MqttCron() error {
}
}
- // for psId, ok := range ca.Mqtt.Mqtt.SungrowPsIds {
- // if !ok {
- // continue
- // }
- //
- // for _, endpoint := range All {
- // response := data.GetByEndPointName(endpoint, iSolarCloud.SunGrowDataRequest{ PsId: &psId })
- // ca.Error = ca.Update(endpoint, response.Data, newDay)
- // if ca.Error != nil {
- // break
- // }
- // }
- // }
-
ca.Mqtt.Mqtt.LastRefresh = time.Now()
}
@@ -388,7 +386,7 @@ func (ca *Cmds) Update(endpoint string, data api.DataMap, newDay bool) error {
// Also getPowerStatistics, getHouseholdStoragePsReport, getPsList, getUpTimePoint,
cmdLog.LogPrintDate("Syncing %d entries with HASSIO from %s.\n", len(data.Map), endpoint)
- for _, o := range data.Order {
+ for o := range data.Map {
entries := data.Map[o]
r := entries.GetEntry(api.LastEntry) // Gets the last entry
if !r.Point.Valid {
@@ -423,6 +421,9 @@ func (ca *Cmds) Update(endpoint string, data api.DataMap, newDay bool) error {
// LastResetValueTemplate: "",
}
+ if strings.Contains(fullId, "device_type_count") {
+ fmt.Printf("")
+ }
if newDay {
fmt.Printf("C")
ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishConfig(re)
@@ -455,270 +456,3 @@ func (ca *Cmds) Update(endpoint string, data api.DataMap, newDay bool) error {
}
return ca.Error
}
-
-// func (ca *Cmds) Update1(psId api.Integer, newDay bool) error {
-// for range Only.Once {
-// // Also getPowerStatistics, getHouseholdStoragePsReport, getPsList, getUpTimePoint,
-// ep := ca.Api.SunGrow.QueryDevice(psId)
-// if ep.IsError() {
-// ca.Error = ep.GetError()
-// break
-// }
-// data := ep.GetData()
-//
-// cmdLog.LogPrintDate("Syncing %d entries with HASSIO.\n", len(data.DataPoints))
-// for _, o := range data.Order {
-// entries := data.DataPoints[o]
-// r := entries.GetEntry(api.LastEntry) // Gets the last entry
-// if !r.Point.Valid {
-// fmt.Printf("\nInvalid: %v\n", r)
-// continue
-// }
-//
-// if strings.Contains(strings.ToLower(string(r.Point.Id)), "count") {
-// fmt.Sprintf("")
-// }
-//
-// fullId := string(r.FullId)
-// if r.Point.GroupName == "alias" {
-// fullId = mmHa.JoinStringsForId(r.Parent.Key, r.Point.Parents.Index[0], string(r.Point.Id))
-// }
-//
-// re := mmHa.EntityConfig {
-// Name: mmHa.JoinStringsForName(" - ", fullId), // r.Point.Name, // PointName,
-// SubName: "",
-// ParentId: r.EndPoint,
-// ParentName: r.Parent.Key,
-// UniqueId: string(r.Point.Id),
-// // UniqueId: r.Id,
-// FullId: fullId, // string(r.FullId), // WAS r.Point.FullId
-// // FullName: r.Point.Name,
-// Units: r.Point.Unit,
-// ValueName: r.Point.Name,
-// // ValueName: r.Id,
-// DeviceClass: "",
-// StateClass: r.Point.TimeSpan,
-// Value: r.Value,
-//
-// // Icon: "",
-// // ValueTemplate: "",
-// // LastReset: "",
-// // LastResetValueTemplate: "",
-// }
-//
-// if newDay {
-// fmt.Printf("C")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-//
-// fmt.Printf("U")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-// fmt.Println()
-// }
-//
-// if ca.Error != nil {
-// cmdLog.LogPrintDate("Error: %s\n", ca.Error)
-// }
-// return ca.Error
-// }
-
-// func (ca *Cmds) Update2(psId api.Integer, newDay bool) error {
-// for range Only.Once {
-// ep := ca.Api.SunGrow.QueryPs(psId)
-// if ep.IsError() {
-// ca.Error = ep.GetError()
-// break
-// }
-// data := ep.GetData()
-//
-// cmdLog.LogPrintDate("Syncing %d entries with HASSIO.\n", len(data.DataPoints))
-// for _, o := range data.Order {
-// entries := data.DataPoints[o]
-// r := entries.GetEntry(api.LastEntry) // Gets the last entry
-// if !r.Point.Valid {
-// fmt.Printf("\nInvalid: %v\n", r)
-// continue
-// }
-//
-// fullId := string(r.FullId)
-// if r.Point.GroupName == "alias" {
-// fullId = mmHa.JoinStringsForId(r.Parent.Key, r.Point.Parents.Index[0], string(r.Point.Id))
-// }
-//
-// re := mmHa.EntityConfig {
-// Name: mmHa.JoinStringsForName(" - ", fullId), // r.Point.Name, // PointName,
-// SubName: "",
-// ParentId: r.EndPoint,
-// ParentName: r.Parent.Key,
-// UniqueId: string(r.Point.Id),
-// // UniqueId: r.Id,
-// FullId: fullId, // string(r.FullId), // WAS r.Point.FullId
-// // FullName: r.Point.Name,
-// Units: r.Point.Unit,
-// ValueName: r.Point.Name,
-// // ValueName: r.Id,
-// DeviceClass: "",
-// StateClass: r.Point.TimeSpan,
-// Value: r.Value,
-//
-// // Icon: "",
-// // ValueTemplate: "",
-// // LastReset: "",
-// // LastResetValueTemplate: "",
-// }
-//
-// if newDay {
-// fmt.Printf("C")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-//
-// fmt.Printf("U")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-// fmt.Println()
-// }
-//
-// if ca.Error != nil {
-// cmdLog.LogPrintDate("Error: %s\n", ca.Error)
-// }
-// return ca.Error
-// }
-
-// func (ca *Cmds) Update3(psId api.Integer, newDay bool) error {
-// for range Only.Once {
-// // Also getPowerStatistics, getHouseholdStoragePsReport, getPsList, getUpTimePoint,
-// ep := ca.Api.SunGrow.QueryPs(psId)
-// if ep.IsError() {
-// ca.Error = ep.GetError()
-// break
-// }
-// data := ep.GetData()
-//
-// cmdLog.LogPrintDate("Syncing %d entries with HASSIO.\n", len(data.DataPoints))
-// for _, o := range data.Order {
-// entries := data.DataPoints[o]
-// r := entries.GetEntry(api.LastEntry) // Gets the last entry
-// if !r.Point.Valid {
-// fmt.Printf("\nInvalid: %v\n", r)
-// continue
-// }
-//
-// fullId := string(r.FullId)
-// if r.Point.GroupName == "alias" {
-// fullId = mmHa.JoinStringsForId(r.Parent.Key, r.Point.Parents.Index[0], string(r.Point.Id))
-// }
-//
-// re := mmHa.EntityConfig {
-// Name: mmHa.JoinStringsForName(" - ", fullId), // r.Point.Name, // PointName,
-// SubName: "",
-// ParentId: r.EndPoint,
-// ParentName: r.Parent.Key,
-// UniqueId: string(r.Point.Id),
-// // UniqueId: r.Id,
-// FullId: fullId, // string(r.FullId), // WAS r.Point.FullId
-// // FullName: r.Point.Name,
-// Units: r.Point.Unit,
-// ValueName: r.Point.Name,
-// // ValueName: r.Id,
-// DeviceClass: "",
-// StateClass: r.Point.TimeSpan,
-// Value: r.Value,
-//
-// // Icon: "",
-// // ValueTemplate: "",
-// // LastReset: "",
-// // LastResetValueTemplate: "",
-// }
-//
-// if newDay {
-// fmt.Printf("C")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishConfig(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-//
-// fmt.Printf("U")
-// ca.Error = ca.Mqtt.Mqtt.BinarySensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-//
-// ca.Error = ca.Mqtt.Mqtt.SensorPublishValue(re)
-// if ca.Error != nil {
-// break
-// }
-// }
-// fmt.Println()
-// }
-//
-// if ca.Error != nil {
-// cmdLog.LogPrintDate("Error: %s\n", ca.Error)
-// }
-// return ca.Error
-// }
-
-
-// func toggle(v string) string {
-// switch v {
-// case "OFF":
-// v = "ON"
-// case "ON":
-// v = "OFF"
-// }
-// return v
-// }
-//
-// func randoPercent() string {
-// t := time.Now()
-// min := 0
-// max := t.Second()
-// i := (rand.Intn(max - min) + min) * t.Minute() // / float64(max)
-// return fmt.Sprintf("%.2f", (float64(i) / 3600) * 100)
-// }
-//
-// func randoKWh() string {
-// t := time.Now()
-// min := 0
-// max := t.Minute()
-// i := (rand.Intn(max - min) + min) * t.Second() // / float64(max)
-// return fmt.Sprintf("%.2f", (float64(i) / 3600) * 11000)
-// }
diff --git a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go
index 7dbf70220..1663562c0 100644
--- a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go
+++ b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go
index 4685fb70e..702875042 100644
--- a/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go
+++ b/iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/acceptPsSharing/data.go b/iSolarCloud/AppService/acceptPsSharing/data.go
index 2e6d5a292..265faaaab 100644
--- a/iSolarCloud/AppService/acceptPsSharing/data.go
+++ b/iSolarCloud/AppService/acceptPsSharing/data.go
@@ -56,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/acceptPsSharing/struct.go b/iSolarCloud/AppService/acceptPsSharing/struct.go
index 75491b952..b4f442a7b 100644
--- a/iSolarCloud/AppService/acceptPsSharing/struct.go
+++ b/iSolarCloud/AppService/acceptPsSharing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/activateEmail/data.go b/iSolarCloud/AppService/activateEmail/data.go
index 60fb60679..e4ad0b4e3 100644
--- a/iSolarCloud/AppService/activateEmail/data.go
+++ b/iSolarCloud/AppService/activateEmail/data.go
@@ -56,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/activateEmail/struct.go b/iSolarCloud/AppService/activateEmail/struct.go
index fb4d177b5..de8ffcfb4 100644
--- a/iSolarCloud/AppService/activateEmail/struct.go
+++ b/iSolarCloud/AppService/activateEmail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addConfig/data.go b/iSolarCloud/AppService/addConfig/data.go
index aa2554b67..2d195269c 100644
--- a/iSolarCloud/AppService/addConfig/data.go
+++ b/iSolarCloud/AppService/addConfig/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addConfig/struct.go b/iSolarCloud/AppService/addConfig/struct.go
index b5cc5e806..621de1c28 100644
--- a/iSolarCloud/AppService/addConfig/struct.go
+++ b/iSolarCloud/AppService/addConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addDeviceRepair/data.go b/iSolarCloud/AppService/addDeviceRepair/data.go
index 2370b81e3..9e4049e7d 100644
--- a/iSolarCloud/AppService/addDeviceRepair/data.go
+++ b/iSolarCloud/AppService/addDeviceRepair/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addDeviceRepair/struct.go b/iSolarCloud/AppService/addDeviceRepair/struct.go
index c86bc6c85..4a04317b4 100644
--- a/iSolarCloud/AppService/addDeviceRepair/struct.go
+++ b/iSolarCloud/AppService/addDeviceRepair/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go b/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go
index 02a267e19..767006d2c 100644
--- a/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go
+++ b/iSolarCloud/AppService/addDeviceToStructureForHousehold/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go b/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go
index 992c391d4..77eb533d3 100644
--- a/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go
+++ b/iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go
index 16c6757ac..8c8bd220b 100644
--- a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go
+++ b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go
index ba2e26753..02c53f385 100644
--- a/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go
+++ b/iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addFault/data.go b/iSolarCloud/AppService/addFault/data.go
index 897429f0e..dd000ebd1 100644
--- a/iSolarCloud/AppService/addFault/data.go
+++ b/iSolarCloud/AppService/addFault/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addFault/struct.go b/iSolarCloud/AppService/addFault/struct.go
index aad6de2af..dd2ab47e0 100644
--- a/iSolarCloud/AppService/addFault/struct.go
+++ b/iSolarCloud/AppService/addFault/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addFaultOrder/data.go b/iSolarCloud/AppService/addFaultOrder/data.go
index 61b41aadd..506d12711 100644
--- a/iSolarCloud/AppService/addFaultOrder/data.go
+++ b/iSolarCloud/AppService/addFaultOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addFaultOrder/struct.go b/iSolarCloud/AppService/addFaultOrder/struct.go
index 2d73a1f0d..032147d0a 100644
--- a/iSolarCloud/AppService/addFaultOrder/struct.go
+++ b/iSolarCloud/AppService/addFaultOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addFaultPlan/data.go b/iSolarCloud/AppService/addFaultPlan/data.go
index 66673b2b1..8c46ec50e 100644
--- a/iSolarCloud/AppService/addFaultPlan/data.go
+++ b/iSolarCloud/AppService/addFaultPlan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addFaultPlan/struct.go b/iSolarCloud/AppService/addFaultPlan/struct.go
index ed04b5896..216f36494 100644
--- a/iSolarCloud/AppService/addFaultPlan/struct.go
+++ b/iSolarCloud/AppService/addFaultPlan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addFaultRepairSteps/data.go b/iSolarCloud/AppService/addFaultRepairSteps/data.go
index 8b7ecd64e..15fea0021 100644
--- a/iSolarCloud/AppService/addFaultRepairSteps/data.go
+++ b/iSolarCloud/AppService/addFaultRepairSteps/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addFaultRepairSteps/struct.go b/iSolarCloud/AppService/addFaultRepairSteps/struct.go
index 2cc90c53b..6e7bbd5ec 100644
--- a/iSolarCloud/AppService/addFaultRepairSteps/struct.go
+++ b/iSolarCloud/AppService/addFaultRepairSteps/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addHouseholdEvaluation/data.go b/iSolarCloud/AppService/addHouseholdEvaluation/data.go
index 41b51fd85..8b8d4e268 100644
--- a/iSolarCloud/AppService/addHouseholdEvaluation/data.go
+++ b/iSolarCloud/AppService/addHouseholdEvaluation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addHouseholdEvaluation/struct.go b/iSolarCloud/AppService/addHouseholdEvaluation/struct.go
index 9eaf2e452..23430645d 100644
--- a/iSolarCloud/AppService/addHouseholdEvaluation/struct.go
+++ b/iSolarCloud/AppService/addHouseholdEvaluation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go
index f2531bec3..a3e63c564 100644
--- a/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go
+++ b/iSolarCloud/AppService/addHouseholdLeaveMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go
index 61f35de4a..bdbc6e900 100644
--- a/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go
+++ b/iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go b/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go
index e2fac4222..da6229f83 100644
--- a/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go
+++ b/iSolarCloud/AppService/addHouseholdOpinionFeedback/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go b/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go
index 19d411c9a..4fd510048 100644
--- a/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go
+++ b/iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addHouseholdWorkOrder/data.go b/iSolarCloud/AppService/addHouseholdWorkOrder/data.go
index 8aa6fa5a9..30d2893e3 100644
--- a/iSolarCloud/AppService/addHouseholdWorkOrder/data.go
+++ b/iSolarCloud/AppService/addHouseholdWorkOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go
index b707ebfc1..3af65029f 100644
--- a/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go
+++ b/iSolarCloud/AppService/addHouseholdWorkOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addOnDutyInfo/data.go b/iSolarCloud/AppService/addOnDutyInfo/data.go
index 54d2e74ba..139ba4e6e 100644
--- a/iSolarCloud/AppService/addOnDutyInfo/data.go
+++ b/iSolarCloud/AppService/addOnDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addOnDutyInfo/struct.go b/iSolarCloud/AppService/addOnDutyInfo/struct.go
index 619e56423..328ddcbef 100644
--- a/iSolarCloud/AppService/addOnDutyInfo/struct.go
+++ b/iSolarCloud/AppService/addOnDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addOperRule/data.go b/iSolarCloud/AppService/addOperRule/data.go
index 290dece3b..c331516eb 100644
--- a/iSolarCloud/AppService/addOperRule/data.go
+++ b/iSolarCloud/AppService/addOperRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addOperRule/struct.go b/iSolarCloud/AppService/addOperRule/struct.go
index af69fb27b..5159acaaf 100644
--- a/iSolarCloud/AppService/addOperRule/struct.go
+++ b/iSolarCloud/AppService/addOperRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addOrDelPsStructure/data.go b/iSolarCloud/AppService/addOrDelPsStructure/data.go
index 105ad28a3..14609805f 100644
--- a/iSolarCloud/AppService/addOrDelPsStructure/data.go
+++ b/iSolarCloud/AppService/addOrDelPsStructure/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addOrDelPsStructure/struct.go b/iSolarCloud/AppService/addOrDelPsStructure/struct.go
index b69af2f21..c6817dadb 100644
--- a/iSolarCloud/AppService/addOrDelPsStructure/struct.go
+++ b/iSolarCloud/AppService/addOrDelPsStructure/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addOrderStep/data.go b/iSolarCloud/AppService/addOrderStep/data.go
index 59a7a245f..0614d96e9 100644
--- a/iSolarCloud/AppService/addOrderStep/data.go
+++ b/iSolarCloud/AppService/addOrderStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addOrderStep/struct.go b/iSolarCloud/AppService/addOrderStep/struct.go
index d551db1de..b2d079b0b 100644
--- a/iSolarCloud/AppService/addOrderStep/struct.go
+++ b/iSolarCloud/AppService/addOrderStep/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addPowerStationForHousehold/data.go b/iSolarCloud/AppService/addPowerStationForHousehold/data.go
index c503f5341..8254975ab 100644
--- a/iSolarCloud/AppService/addPowerStationForHousehold/data.go
+++ b/iSolarCloud/AppService/addPowerStationForHousehold/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addPowerStationForHousehold/struct.go b/iSolarCloud/AppService/addPowerStationForHousehold/struct.go
index b496dfc0c..fc5e7c12e 100644
--- a/iSolarCloud/AppService/addPowerStationForHousehold/struct.go
+++ b/iSolarCloud/AppService/addPowerStationForHousehold/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addPowerStationInfo/data.go b/iSolarCloud/AppService/addPowerStationInfo/data.go
index 1e1dcc8a9..32e6d53fd 100644
--- a/iSolarCloud/AppService/addPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/addPowerStationInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addPowerStationInfo/struct.go b/iSolarCloud/AppService/addPowerStationInfo/struct.go
index 2149aeb6d..2fdb170fa 100644
--- a/iSolarCloud/AppService/addPowerStationInfo/struct.go
+++ b/iSolarCloud/AppService/addPowerStationInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addReportConfigEmail/data.go b/iSolarCloud/AppService/addReportConfigEmail/data.go
index 7b6f0ff80..60ee8c537 100644
--- a/iSolarCloud/AppService/addReportConfigEmail/data.go
+++ b/iSolarCloud/AppService/addReportConfigEmail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addReportConfigEmail/struct.go b/iSolarCloud/AppService/addReportConfigEmail/struct.go
index 5a1a42c32..50c3d5d5d 100644
--- a/iSolarCloud/AppService/addReportConfigEmail/struct.go
+++ b/iSolarCloud/AppService/addReportConfigEmail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addSysAdvancedParam/data.go b/iSolarCloud/AppService/addSysAdvancedParam/data.go
index 2f62d0a7c..48e0c2884 100644
--- a/iSolarCloud/AppService/addSysAdvancedParam/data.go
+++ b/iSolarCloud/AppService/addSysAdvancedParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addSysAdvancedParam/struct.go b/iSolarCloud/AppService/addSysAdvancedParam/struct.go
index 4760094c5..e02a4bbb3 100644
--- a/iSolarCloud/AppService/addSysAdvancedParam/struct.go
+++ b/iSolarCloud/AppService/addSysAdvancedParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/addSysOrgNew/data.go b/iSolarCloud/AppService/addSysOrgNew/data.go
index 737ecb757..474a71913 100644
--- a/iSolarCloud/AppService/addSysOrgNew/data.go
+++ b/iSolarCloud/AppService/addSysOrgNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/addSysOrgNew/struct.go b/iSolarCloud/AppService/addSysOrgNew/struct.go
index 3fd5620a0..8e8fb7e70 100644
--- a/iSolarCloud/AppService/addSysOrgNew/struct.go
+++ b/iSolarCloud/AppService/addSysOrgNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/aliPayAppTest/data.go b/iSolarCloud/AppService/aliPayAppTest/data.go
index e9e5c0d74..e334c3632 100644
--- a/iSolarCloud/AppService/aliPayAppTest/data.go
+++ b/iSolarCloud/AppService/aliPayAppTest/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/aliPayAppTest/struct.go b/iSolarCloud/AppService/aliPayAppTest/struct.go
index adaf76ab3..dbd43cbd2 100644
--- a/iSolarCloud/AppService/aliPayAppTest/struct.go
+++ b/iSolarCloud/AppService/aliPayAppTest/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/auditOperRule/data.go b/iSolarCloud/AppService/auditOperRule/data.go
index 386312601..ff7a87b63 100644
--- a/iSolarCloud/AppService/auditOperRule/data.go
+++ b/iSolarCloud/AppService/auditOperRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/auditOperRule/struct.go b/iSolarCloud/AppService/auditOperRule/struct.go
index b8e0d5cf8..5060fbe38 100644
--- a/iSolarCloud/AppService/auditOperRule/struct.go
+++ b/iSolarCloud/AppService/auditOperRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchAddStationBySn/data.go b/iSolarCloud/AppService/batchAddStationBySn/data.go
index db2eb98d0..1db1da26a 100644
--- a/iSolarCloud/AppService/batchAddStationBySn/data.go
+++ b/iSolarCloud/AppService/batchAddStationBySn/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchAddStationBySn/struct.go b/iSolarCloud/AppService/batchAddStationBySn/struct.go
index 19de00cb3..bcffc5802 100644
--- a/iSolarCloud/AppService/batchAddStationBySn/struct.go
+++ b/iSolarCloud/AppService/batchAddStationBySn/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchImportSN/data.go b/iSolarCloud/AppService/batchImportSN/data.go
index 6defbc776..6815b2abe 100644
--- a/iSolarCloud/AppService/batchImportSN/data.go
+++ b/iSolarCloud/AppService/batchImportSN/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchImportSN/struct.go b/iSolarCloud/AppService/batchImportSN/struct.go
index 3679607c0..090e175d2 100644
--- a/iSolarCloud/AppService/batchImportSN/struct.go
+++ b/iSolarCloud/AppService/batchImportSN/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchInsertUserAndOrg/data.go b/iSolarCloud/AppService/batchInsertUserAndOrg/data.go
index 7143bc888..5f96e61be 100644
--- a/iSolarCloud/AppService/batchInsertUserAndOrg/data.go
+++ b/iSolarCloud/AppService/batchInsertUserAndOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go b/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go
index 9208dbe1e..f7ee6c47d 100644
--- a/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go
+++ b/iSolarCloud/AppService/batchInsertUserAndOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go
index a2ed01dce..b3805c974 100644
--- a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go
+++ b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go
index b7fcc9642..54bfc3154 100644
--- a/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go
+++ b/iSolarCloud/AppService/batchModifyDevicesInfoAndPropertis/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchProcessPlantReport/data.go b/iSolarCloud/AppService/batchProcessPlantReport/data.go
index 801c855c8..b2094db24 100644
--- a/iSolarCloud/AppService/batchProcessPlantReport/data.go
+++ b/iSolarCloud/AppService/batchProcessPlantReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchProcessPlantReport/struct.go b/iSolarCloud/AppService/batchProcessPlantReport/struct.go
index c40b19f6a..96580440a 100644
--- a/iSolarCloud/AppService/batchProcessPlantReport/struct.go
+++ b/iSolarCloud/AppService/batchProcessPlantReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchUpdateDeviceSim/data.go b/iSolarCloud/AppService/batchUpdateDeviceSim/data.go
index abe2213e2..fb1bbb99b 100644
--- a/iSolarCloud/AppService/batchUpdateDeviceSim/data.go
+++ b/iSolarCloud/AppService/batchUpdateDeviceSim/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go b/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go
index 6a4365566..f35ba2e89 100644
--- a/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go
+++ b/iSolarCloud/AppService/batchUpdateDeviceSim/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go
index b76283c94..72be99fe1 100644
--- a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go
+++ b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go
index 466b21801..471038a7a 100644
--- a/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go
+++ b/iSolarCloud/AppService/batchUpdateUserIsAgreeGdpr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/boundMobilePhone/data.go b/iSolarCloud/AppService/boundMobilePhone/data.go
index 732d4815f..df5f08d3d 100644
--- a/iSolarCloud/AppService/boundMobilePhone/data.go
+++ b/iSolarCloud/AppService/boundMobilePhone/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/boundMobilePhone/struct.go b/iSolarCloud/AppService/boundMobilePhone/struct.go
index 86af97fb3..4677b71ba 100644
--- a/iSolarCloud/AppService/boundMobilePhone/struct.go
+++ b/iSolarCloud/AppService/boundMobilePhone/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/boundUserMail/data.go b/iSolarCloud/AppService/boundUserMail/data.go
index b5d880e3c..796dab747 100644
--- a/iSolarCloud/AppService/boundUserMail/data.go
+++ b/iSolarCloud/AppService/boundUserMail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/boundUserMail/struct.go b/iSolarCloud/AppService/boundUserMail/struct.go
index ad2e8a3e9..7239b5ad6 100644
--- a/iSolarCloud/AppService/boundUserMail/struct.go
+++ b/iSolarCloud/AppService/boundUserMail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go b/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go
index 670fc11b7..2128f8cc3 100644
--- a/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go
+++ b/iSolarCloud/AppService/caculateDeviceInputDiscrete/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go b/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go
index e2875628a..b35d1dee1 100644
--- a/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go
+++ b/iSolarCloud/AppService/caculateDeviceInputDiscrete/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/calculateDeviceDiscrete/data.go b/iSolarCloud/AppService/calculateDeviceDiscrete/data.go
index 0f4c3cded..d413a2997 100644
--- a/iSolarCloud/AppService/calculateDeviceDiscrete/data.go
+++ b/iSolarCloud/AppService/calculateDeviceDiscrete/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go b/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go
index 2592ab63b..2deba05fb 100644
--- a/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go
+++ b/iSolarCloud/AppService/calculateDeviceDiscrete/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/calculateInitialCompensationData/data.go b/iSolarCloud/AppService/calculateInitialCompensationData/data.go
index 142254ee9..77dadcf27 100644
--- a/iSolarCloud/AppService/calculateInitialCompensationData/data.go
+++ b/iSolarCloud/AppService/calculateInitialCompensationData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/calculateInitialCompensationData/struct.go b/iSolarCloud/AppService/calculateInitialCompensationData/struct.go
index 07bb4398c..eb837dca7 100644
--- a/iSolarCloud/AppService/calculateInitialCompensationData/struct.go
+++ b/iSolarCloud/AppService/calculateInitialCompensationData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cancelDeliverMail/data.go b/iSolarCloud/AppService/cancelDeliverMail/data.go
index a476ee422..9466a9ff6 100644
--- a/iSolarCloud/AppService/cancelDeliverMail/data.go
+++ b/iSolarCloud/AppService/cancelDeliverMail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cancelDeliverMail/struct.go b/iSolarCloud/AppService/cancelDeliverMail/struct.go
index 189ec1a45..7fec9da30 100644
--- a/iSolarCloud/AppService/cancelDeliverMail/struct.go
+++ b/iSolarCloud/AppService/cancelDeliverMail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cancelOrderScan/data.go b/iSolarCloud/AppService/cancelOrderScan/data.go
index 867af11c8..0c2d239bc 100644
--- a/iSolarCloud/AppService/cancelOrderScan/data.go
+++ b/iSolarCloud/AppService/cancelOrderScan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cancelOrderScan/struct.go b/iSolarCloud/AppService/cancelOrderScan/struct.go
index 40f7527d5..9636566d6 100644
--- a/iSolarCloud/AppService/cancelOrderScan/struct.go
+++ b/iSolarCloud/AppService/cancelOrderScan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cancelParamSetTask/data.go b/iSolarCloud/AppService/cancelParamSetTask/data.go
index 0a0136d08..ca4a70fd0 100644
--- a/iSolarCloud/AppService/cancelParamSetTask/data.go
+++ b/iSolarCloud/AppService/cancelParamSetTask/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cancelParamSetTask/struct.go b/iSolarCloud/AppService/cancelParamSetTask/struct.go
index 1a9ca7285..2864c50d1 100644
--- a/iSolarCloud/AppService/cancelParamSetTask/struct.go
+++ b/iSolarCloud/AppService/cancelParamSetTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cancelPsSharing/data.go b/iSolarCloud/AppService/cancelPsSharing/data.go
index c96ad2947..58bbc7279 100644
--- a/iSolarCloud/AppService/cancelPsSharing/data.go
+++ b/iSolarCloud/AppService/cancelPsSharing/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cancelPsSharing/struct.go b/iSolarCloud/AppService/cancelPsSharing/struct.go
index 1aee422fb..20a54a0d0 100644
--- a/iSolarCloud/AppService/cancelPsSharing/struct.go
+++ b/iSolarCloud/AppService/cancelPsSharing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cancelRechargeOrder/data.go b/iSolarCloud/AppService/cancelRechargeOrder/data.go
index dd8f841e6..f4c98513b 100644
--- a/iSolarCloud/AppService/cancelRechargeOrder/data.go
+++ b/iSolarCloud/AppService/cancelRechargeOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cancelRechargeOrder/struct.go b/iSolarCloud/AppService/cancelRechargeOrder/struct.go
index 48d2c16f8..d1ae1fa08 100644
--- a/iSolarCloud/AppService/cancelRechargeOrder/struct.go
+++ b/iSolarCloud/AppService/cancelRechargeOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/changRechargeOrderToCancel/data.go b/iSolarCloud/AppService/changRechargeOrderToCancel/data.go
index 38a9b577b..7ec23ada0 100644
--- a/iSolarCloud/AppService/changRechargeOrderToCancel/data.go
+++ b/iSolarCloud/AppService/changRechargeOrderToCancel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go b/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go
index d1c8db39a..5e9650e6c 100644
--- a/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go
+++ b/iSolarCloud/AppService/changRechargeOrderToCancel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go b/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go
index 9cff33ded..d22a570be 100644
--- a/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go
+++ b/iSolarCloud/AppService/changeHouseholdUser2Installer/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go b/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go
index 88080f886..2a55820a4 100644
--- a/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go
+++ b/iSolarCloud/AppService/changeHouseholdUser2Installer/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/changeRemoteParam/data.go b/iSolarCloud/AppService/changeRemoteParam/data.go
index 6fe8102ce..0cceae7e8 100644
--- a/iSolarCloud/AppService/changeRemoteParam/data.go
+++ b/iSolarCloud/AppService/changeRemoteParam/data.go
@@ -39,7 +39,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/changeRemoteParam/struct.go b/iSolarCloud/AppService/changeRemoteParam/struct.go
index 71e26c0c2..344b0cc68 100644
--- a/iSolarCloud/AppService/changeRemoteParam/struct.go
+++ b/iSolarCloud/AppService/changeRemoteParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkDealerOrgCode/data.go b/iSolarCloud/AppService/checkDealerOrgCode/data.go
index a4ced58c4..9bc2dba2d 100644
--- a/iSolarCloud/AppService/checkDealerOrgCode/data.go
+++ b/iSolarCloud/AppService/checkDealerOrgCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkDealerOrgCode/struct.go b/iSolarCloud/AppService/checkDealerOrgCode/struct.go
index 43b1bdde9..7f324d1ab 100644
--- a/iSolarCloud/AppService/checkDealerOrgCode/struct.go
+++ b/iSolarCloud/AppService/checkDealerOrgCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go
index 287b561bf..8e06806e4 100644
--- a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go
+++ b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go
index 56a47ad7b..10772bac0 100644
--- a/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go
+++ b/iSolarCloud/AppService/checkDevSnIsBelongsToUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkInverterResult/data.go b/iSolarCloud/AppService/checkInverterResult/data.go
index 40548102f..d7601a95b 100644
--- a/iSolarCloud/AppService/checkInverterResult/data.go
+++ b/iSolarCloud/AppService/checkInverterResult/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkInverterResult/struct.go b/iSolarCloud/AppService/checkInverterResult/struct.go
index 24e4652b7..f22ac18e7 100644
--- a/iSolarCloud/AppService/checkInverterResult/struct.go
+++ b/iSolarCloud/AppService/checkInverterResult/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkIsCanDoParamSet/data.go b/iSolarCloud/AppService/checkIsCanDoParamSet/data.go
index 72299f843..a5e30f6f3 100644
--- a/iSolarCloud/AppService/checkIsCanDoParamSet/data.go
+++ b/iSolarCloud/AppService/checkIsCanDoParamSet/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go b/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go
index 02cee5f49..b8cc0c637 100644
--- a/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go
+++ b/iSolarCloud/AppService/checkIsCanDoParamSet/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkIsIvScan/data.go b/iSolarCloud/AppService/checkIsIvScan/data.go
index 7a0242499..732606611 100644
--- a/iSolarCloud/AppService/checkIsIvScan/data.go
+++ b/iSolarCloud/AppService/checkIsIvScan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkIsIvScan/struct.go b/iSolarCloud/AppService/checkIsIvScan/struct.go
index 5d9c18d46..5e0c70b20 100644
--- a/iSolarCloud/AppService/checkIsIvScan/struct.go
+++ b/iSolarCloud/AppService/checkIsIvScan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkOssObjectExist/data.go b/iSolarCloud/AppService/checkOssObjectExist/data.go
index 123d37093..0f08cefc5 100644
--- a/iSolarCloud/AppService/checkOssObjectExist/data.go
+++ b/iSolarCloud/AppService/checkOssObjectExist/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkOssObjectExist/struct.go b/iSolarCloud/AppService/checkOssObjectExist/struct.go
index 361fad178..ef5c0a382 100644
--- a/iSolarCloud/AppService/checkOssObjectExist/struct.go
+++ b/iSolarCloud/AppService/checkOssObjectExist/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkServiceIsConnect/data.go b/iSolarCloud/AppService/checkServiceIsConnect/data.go
index a4eb63d61..b21a67f51 100644
--- a/iSolarCloud/AppService/checkServiceIsConnect/data.go
+++ b/iSolarCloud/AppService/checkServiceIsConnect/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkServiceIsConnect/struct.go b/iSolarCloud/AppService/checkServiceIsConnect/struct.go
index af6aa856e..b46e140db 100644
--- a/iSolarCloud/AppService/checkServiceIsConnect/struct.go
+++ b/iSolarCloud/AppService/checkServiceIsConnect/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkTechnicalParameters/data.go b/iSolarCloud/AppService/checkTechnicalParameters/data.go
index 57f64267c..f7a43a1e8 100644
--- a/iSolarCloud/AppService/checkTechnicalParameters/data.go
+++ b/iSolarCloud/AppService/checkTechnicalParameters/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkTechnicalParameters/struct.go b/iSolarCloud/AppService/checkTechnicalParameters/struct.go
index 359a88a41..0258fe618 100644
--- a/iSolarCloud/AppService/checkTechnicalParameters/struct.go
+++ b/iSolarCloud/AppService/checkTechnicalParameters/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUnitStatus/data.go b/iSolarCloud/AppService/checkUnitStatus/data.go
index 1c8b70a54..fb0c24b55 100644
--- a/iSolarCloud/AppService/checkUnitStatus/data.go
+++ b/iSolarCloud/AppService/checkUnitStatus/data.go
@@ -56,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUnitStatus/struct.go b/iSolarCloud/AppService/checkUnitStatus/struct.go
index e74f8a30f..3f36c6b75 100644
--- a/iSolarCloud/AppService/checkUnitStatus/struct.go
+++ b/iSolarCloud/AppService/checkUnitStatus/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go b/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go
index 15ab902bc..49baa1783 100644
--- a/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go
+++ b/iSolarCloud/AppService/checkUpRechargeDevicePaying/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go b/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go
index 1bd6234b7..f13bf5cad 100644
--- a/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go
+++ b/iSolarCloud/AppService/checkUpRechargeDevicePaying/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserAccountUnique/data.go b/iSolarCloud/AppService/checkUserAccountUnique/data.go
index e5a513d87..a355cabbf 100644
--- a/iSolarCloud/AppService/checkUserAccountUnique/data.go
+++ b/iSolarCloud/AppService/checkUserAccountUnique/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserAccountUnique/struct.go b/iSolarCloud/AppService/checkUserAccountUnique/struct.go
index 6fe009fbf..fa1b9fe09 100644
--- a/iSolarCloud/AppService/checkUserAccountUnique/struct.go
+++ b/iSolarCloud/AppService/checkUserAccountUnique/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go b/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go
index aeb612d30..9e34b0f78 100644
--- a/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go
+++ b/iSolarCloud/AppService/checkUserAccountUniqueAll/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go b/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go
index dbd1de733..654bbed6b 100644
--- a/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go
+++ b/iSolarCloud/AppService/checkUserAccountUniqueAll/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserInfoUnique/data.go b/iSolarCloud/AppService/checkUserInfoUnique/data.go
index e7f3c56c0..e9aad7c82 100644
--- a/iSolarCloud/AppService/checkUserInfoUnique/data.go
+++ b/iSolarCloud/AppService/checkUserInfoUnique/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserInfoUnique/struct.go b/iSolarCloud/AppService/checkUserInfoUnique/struct.go
index b25416bf1..06492464c 100644
--- a/iSolarCloud/AppService/checkUserInfoUnique/struct.go
+++ b/iSolarCloud/AppService/checkUserInfoUnique/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserIsExist/data.go b/iSolarCloud/AppService/checkUserIsExist/data.go
index 4d011caf1..209bbc43c 100644
--- a/iSolarCloud/AppService/checkUserIsExist/data.go
+++ b/iSolarCloud/AppService/checkUserIsExist/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserIsExist/struct.go b/iSolarCloud/AppService/checkUserIsExist/struct.go
index ab2819e67..2f0a57c31 100644
--- a/iSolarCloud/AppService/checkUserIsExist/struct.go
+++ b/iSolarCloud/AppService/checkUserIsExist/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserListIsExist/data.go b/iSolarCloud/AppService/checkUserListIsExist/data.go
index a80db4ff6..90358b453 100644
--- a/iSolarCloud/AppService/checkUserListIsExist/data.go
+++ b/iSolarCloud/AppService/checkUserListIsExist/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserListIsExist/struct.go b/iSolarCloud/AppService/checkUserListIsExist/struct.go
index 298c058f4..21c7e3038 100644
--- a/iSolarCloud/AppService/checkUserListIsExist/struct.go
+++ b/iSolarCloud/AppService/checkUserListIsExist/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/checkUserPassword/data.go b/iSolarCloud/AppService/checkUserPassword/data.go
index bd77b00a0..27b7c6a0a 100644
--- a/iSolarCloud/AppService/checkUserPassword/data.go
+++ b/iSolarCloud/AppService/checkUserPassword/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/checkUserPassword/struct.go b/iSolarCloud/AppService/checkUserPassword/struct.go
index 16c1d3b3b..4728cd11f 100644
--- a/iSolarCloud/AppService/checkUserPassword/struct.go
+++ b/iSolarCloud/AppService/checkUserPassword/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/cloudDeploymentRecord/data.go b/iSolarCloud/AppService/cloudDeploymentRecord/data.go
index c85fc7d4b..94b9eb6a9 100644
--- a/iSolarCloud/AppService/cloudDeploymentRecord/data.go
+++ b/iSolarCloud/AppService/cloudDeploymentRecord/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/cloudDeploymentRecord/struct.go b/iSolarCloud/AppService/cloudDeploymentRecord/struct.go
index d94083a71..91b6de122 100644
--- a/iSolarCloud/AppService/cloudDeploymentRecord/struct.go
+++ b/iSolarCloud/AppService/cloudDeploymentRecord/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/comfirmParamModel/data.go b/iSolarCloud/AppService/comfirmParamModel/data.go
index afada4f28..e215a3aa8 100644
--- a/iSolarCloud/AppService/comfirmParamModel/data.go
+++ b/iSolarCloud/AppService/comfirmParamModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/comfirmParamModel/struct.go b/iSolarCloud/AppService/comfirmParamModel/struct.go
index ad2937deb..8ecd20e58 100644
--- a/iSolarCloud/AppService/comfirmParamModel/struct.go
+++ b/iSolarCloud/AppService/comfirmParamModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/communicationModuleDetail/data.go b/iSolarCloud/AppService/communicationModuleDetail/data.go
index 5af654243..86947b717 100644
--- a/iSolarCloud/AppService/communicationModuleDetail/data.go
+++ b/iSolarCloud/AppService/communicationModuleDetail/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/communicationModuleDetail/struct.go b/iSolarCloud/AppService/communicationModuleDetail/struct.go
index 9bfefecf9..08064033c 100644
--- a/iSolarCloud/AppService/communicationModuleDetail/struct.go
+++ b/iSolarCloud/AppService/communicationModuleDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/compareValidateCode/data.go b/iSolarCloud/AppService/compareValidateCode/data.go
index ffb79da8a..63167ffca 100644
--- a/iSolarCloud/AppService/compareValidateCode/data.go
+++ b/iSolarCloud/AppService/compareValidateCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/compareValidateCode/struct.go b/iSolarCloud/AppService/compareValidateCode/struct.go
index 37ab1b985..c271dd928 100644
--- a/iSolarCloud/AppService/compareValidateCode/struct.go
+++ b/iSolarCloud/AppService/compareValidateCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/componentInfo2Cloud/data.go b/iSolarCloud/AppService/componentInfo2Cloud/data.go
index c1aaf4707..34a39cef3 100644
--- a/iSolarCloud/AppService/componentInfo2Cloud/data.go
+++ b/iSolarCloud/AppService/componentInfo2Cloud/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/componentInfo2Cloud/struct.go b/iSolarCloud/AppService/componentInfo2Cloud/struct.go
index 4ff94c3be..cdcc97684 100644
--- a/iSolarCloud/AppService/componentInfo2Cloud/struct.go
+++ b/iSolarCloud/AppService/componentInfo2Cloud/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/confirmFault/data.go b/iSolarCloud/AppService/confirmFault/data.go
index a9f35969d..31b79558b 100644
--- a/iSolarCloud/AppService/confirmFault/data.go
+++ b/iSolarCloud/AppService/confirmFault/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/confirmFault/struct.go b/iSolarCloud/AppService/confirmFault/struct.go
index 832a15ea0..4d8bedb63 100644
--- a/iSolarCloud/AppService/confirmFault/struct.go
+++ b/iSolarCloud/AppService/confirmFault/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/confirmIvFault/data.go b/iSolarCloud/AppService/confirmIvFault/data.go
index 7ef0f57db..034d7e18b 100644
--- a/iSolarCloud/AppService/confirmIvFault/data.go
+++ b/iSolarCloud/AppService/confirmIvFault/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/confirmIvFault/struct.go b/iSolarCloud/AppService/confirmIvFault/struct.go
index 1ed47ee68..bf0cbcfe1 100644
--- a/iSolarCloud/AppService/confirmIvFault/struct.go
+++ b/iSolarCloud/AppService/confirmIvFault/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/confirmReportConfig/data.go b/iSolarCloud/AppService/confirmReportConfig/data.go
index dae580e91..922f1f293 100644
--- a/iSolarCloud/AppService/confirmReportConfig/data.go
+++ b/iSolarCloud/AppService/confirmReportConfig/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/confirmReportConfig/struct.go b/iSolarCloud/AppService/confirmReportConfig/struct.go
index 7f0f6e67f..3a30c953f 100644
--- a/iSolarCloud/AppService/confirmReportConfig/struct.go
+++ b/iSolarCloud/AppService/confirmReportConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/createAppkeyInfo/data.go b/iSolarCloud/AppService/createAppkeyInfo/data.go
index 2ef0f2920..5692b0d04 100644
--- a/iSolarCloud/AppService/createAppkeyInfo/data.go
+++ b/iSolarCloud/AppService/createAppkeyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/createAppkeyInfo/struct.go b/iSolarCloud/AppService/createAppkeyInfo/struct.go
index f86629b44..449c438af 100644
--- a/iSolarCloud/AppService/createAppkeyInfo/struct.go
+++ b/iSolarCloud/AppService/createAppkeyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/createRenewInvoice/data.go b/iSolarCloud/AppService/createRenewInvoice/data.go
index 9e415964b..0f5ab388d 100644
--- a/iSolarCloud/AppService/createRenewInvoice/data.go
+++ b/iSolarCloud/AppService/createRenewInvoice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/createRenewInvoice/struct.go b/iSolarCloud/AppService/createRenewInvoice/struct.go
index 45a9e82b2..56b2610d6 100644
--- a/iSolarCloud/AppService/createRenewInvoice/struct.go
+++ b/iSolarCloud/AppService/createRenewInvoice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealCommandReply/data.go b/iSolarCloud/AppService/dealCommandReply/data.go
index ac7e366c8..7b0735fdf 100644
--- a/iSolarCloud/AppService/dealCommandReply/data.go
+++ b/iSolarCloud/AppService/dealCommandReply/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealCommandReply/struct.go b/iSolarCloud/AppService/dealCommandReply/struct.go
index a1a13e4f2..b7678c3b7 100644
--- a/iSolarCloud/AppService/dealCommandReply/struct.go
+++ b/iSolarCloud/AppService/dealCommandReply/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go b/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go
index cc385b4d0..3ed6c5734 100644
--- a/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go
+++ b/iSolarCloud/AppService/dealDeletePsFailPsDelete/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go b/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go
index a269b7fee..c803d4a17 100644
--- a/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go
+++ b/iSolarCloud/AppService/dealDeletePsFailPsDelete/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go
index bc8601cec..6a552ee10 100644
--- a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go
+++ b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go
index 1dbc211f2..1152ea2cd 100644
--- a/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go
+++ b/iSolarCloud/AppService/dealFailRemoteUpgradeSubTasks/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go
index 2cdc0043a..7e9291151 100644
--- a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go
+++ b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go
index 04fd9457c..2e317b9ac 100644
--- a/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go
+++ b/iSolarCloud/AppService/dealFailRemoteUpgradeTasks/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealFaultOrder/data.go b/iSolarCloud/AppService/dealFaultOrder/data.go
index c08b03e41..d850d96d5 100644
--- a/iSolarCloud/AppService/dealFaultOrder/data.go
+++ b/iSolarCloud/AppService/dealFaultOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealFaultOrder/struct.go b/iSolarCloud/AppService/dealFaultOrder/struct.go
index 530eada78..50d002221 100644
--- a/iSolarCloud/AppService/dealFaultOrder/struct.go
+++ b/iSolarCloud/AppService/dealFaultOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go
index ab8d9b115..e60a24318 100644
--- a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go
+++ b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go
index 0a7d5cd9b..eef736d5f 100644
--- a/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go
+++ b/iSolarCloud/AppService/dealGroupStringDisableOrEnable/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go
index 502ead6f3..098c88598 100644
--- a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go
+++ b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go
index e7213e57c..89b5fe81e 100644
--- a/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go
+++ b/iSolarCloud/AppService/dealNumberOfServiceCalls2Mysql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go b/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go
index 9cb8773f4..cc3f94445 100644
--- a/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go
+++ b/iSolarCloud/AppService/dealParamSettingAfterComplete/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go b/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go
index 4c49468e0..929d2838f 100644
--- a/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go
+++ b/iSolarCloud/AppService/dealParamSettingAfterComplete/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealPsDataSupplement/data.go b/iSolarCloud/AppService/dealPsDataSupplement/data.go
index 3ebf95599..0bf19d27d 100644
--- a/iSolarCloud/AppService/dealPsDataSupplement/data.go
+++ b/iSolarCloud/AppService/dealPsDataSupplement/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealPsDataSupplement/struct.go b/iSolarCloud/AppService/dealPsDataSupplement/struct.go
index f46bce5a1..7e042c6ce 100644
--- a/iSolarCloud/AppService/dealPsDataSupplement/struct.go
+++ b/iSolarCloud/AppService/dealPsDataSupplement/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealPsReportEmailSend/data.go b/iSolarCloud/AppService/dealPsReportEmailSend/data.go
index 01843d775..318b60c29 100644
--- a/iSolarCloud/AppService/dealPsReportEmailSend/data.go
+++ b/iSolarCloud/AppService/dealPsReportEmailSend/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealPsReportEmailSend/struct.go b/iSolarCloud/AppService/dealPsReportEmailSend/struct.go
index 89f35cc28..4d3ccfe31 100644
--- a/iSolarCloud/AppService/dealPsReportEmailSend/struct.go
+++ b/iSolarCloud/AppService/dealPsReportEmailSend/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealRemoteUpgrade/data.go b/iSolarCloud/AppService/dealRemoteUpgrade/data.go
index 00c04410d..017e31bf8 100644
--- a/iSolarCloud/AppService/dealRemoteUpgrade/data.go
+++ b/iSolarCloud/AppService/dealRemoteUpgrade/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealRemoteUpgrade/struct.go b/iSolarCloud/AppService/dealRemoteUpgrade/struct.go
index b0cd6adc8..c36004767 100644
--- a/iSolarCloud/AppService/dealRemoteUpgrade/struct.go
+++ b/iSolarCloud/AppService/dealRemoteUpgrade/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealSnElectrifyCheck/data.go b/iSolarCloud/AppService/dealSnElectrifyCheck/data.go
index 32f878dd4..20d6b0974 100644
--- a/iSolarCloud/AppService/dealSnElectrifyCheck/data.go
+++ b/iSolarCloud/AppService/dealSnElectrifyCheck/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go b/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go
index 1dc4dd87f..26100571c 100644
--- a/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go
+++ b/iSolarCloud/AppService/dealSnElectrifyCheck/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go
index 3a76f31bb..161aae86a 100644
--- a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go
+++ b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go
index 34cafe88f..7f7dab92d 100644
--- a/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go
+++ b/iSolarCloud/AppService/dealSysDeviceSimFlowInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go b/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go
index 6e31267b2..417b7f558 100644
--- a/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go
+++ b/iSolarCloud/AppService/dealSysDeviceSimInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go b/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go
index abbe665f5..b99f0c7f6 100644
--- a/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go
+++ b/iSolarCloud/AppService/dealSysDeviceSimInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go
index a9d98db1c..60f83676d 100644
--- a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go
+++ b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go
index 8e76f1fcc..64058e609 100644
--- a/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go
+++ b/iSolarCloud/AppService/definiteTimeDealSnExpRemind/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go b/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go
index 22a28e1ba..73174008e 100644
--- a/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go
+++ b/iSolarCloud/AppService/definiteTimeDealSnStatus/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go b/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go
index cf7de9708..624afcf90 100644
--- a/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go
+++ b/iSolarCloud/AppService/definiteTimeDealSnStatus/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/delDeviceRepair/data.go b/iSolarCloud/AppService/delDeviceRepair/data.go
index b82a04ff8..db9a8b148 100644
--- a/iSolarCloud/AppService/delDeviceRepair/data.go
+++ b/iSolarCloud/AppService/delDeviceRepair/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/delDeviceRepair/struct.go b/iSolarCloud/AppService/delDeviceRepair/struct.go
index 536886f4c..f2486347d 100644
--- a/iSolarCloud/AppService/delDeviceRepair/struct.go
+++ b/iSolarCloud/AppService/delDeviceRepair/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/delOperRule/data.go b/iSolarCloud/AppService/delOperRule/data.go
index b84490b18..a43dd2612 100644
--- a/iSolarCloud/AppService/delOperRule/data.go
+++ b/iSolarCloud/AppService/delOperRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/delOperRule/struct.go b/iSolarCloud/AppService/delOperRule/struct.go
index dcaec36c5..7048a9f23 100644
--- a/iSolarCloud/AppService/delOperRule/struct.go
+++ b/iSolarCloud/AppService/delOperRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/delayCallApiResidueTimes/data.go b/iSolarCloud/AppService/delayCallApiResidueTimes/data.go
index 5c03c96af..a48abf4e0 100644
--- a/iSolarCloud/AppService/delayCallApiResidueTimes/data.go
+++ b/iSolarCloud/AppService/delayCallApiResidueTimes/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go b/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go
index 1982a9cae..f9a2338e7 100644
--- a/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go
+++ b/iSolarCloud/AppService/delayCallApiResidueTimes/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteComponent/data.go b/iSolarCloud/AppService/deleteComponent/data.go
index e36975c4d..c7cd3ccc4 100644
--- a/iSolarCloud/AppService/deleteComponent/data.go
+++ b/iSolarCloud/AppService/deleteComponent/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteComponent/struct.go b/iSolarCloud/AppService/deleteComponent/struct.go
index caca765a2..ae29f048c 100644
--- a/iSolarCloud/AppService/deleteComponent/struct.go
+++ b/iSolarCloud/AppService/deleteComponent/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteCustomerEmployee/data.go b/iSolarCloud/AppService/deleteCustomerEmployee/data.go
index 91edb7275..4e69d3946 100644
--- a/iSolarCloud/AppService/deleteCustomerEmployee/data.go
+++ b/iSolarCloud/AppService/deleteCustomerEmployee/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteCustomerEmployee/struct.go b/iSolarCloud/AppService/deleteCustomerEmployee/struct.go
index a5ccfde6f..0385ef6a9 100644
--- a/iSolarCloud/AppService/deleteCustomerEmployee/struct.go
+++ b/iSolarCloud/AppService/deleteCustomerEmployee/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteDeviceAccount/data.go b/iSolarCloud/AppService/deleteDeviceAccount/data.go
index 6e2bc93ee..3ba7641a1 100644
--- a/iSolarCloud/AppService/deleteDeviceAccount/data.go
+++ b/iSolarCloud/AppService/deleteDeviceAccount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteDeviceAccount/struct.go b/iSolarCloud/AppService/deleteDeviceAccount/struct.go
index 4d847a69d..792c6516b 100644
--- a/iSolarCloud/AppService/deleteDeviceAccount/struct.go
+++ b/iSolarCloud/AppService/deleteDeviceAccount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteDeviceSimById/data.go b/iSolarCloud/AppService/deleteDeviceSimById/data.go
index 01d8c1f58..9850e52a0 100644
--- a/iSolarCloud/AppService/deleteDeviceSimById/data.go
+++ b/iSolarCloud/AppService/deleteDeviceSimById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteDeviceSimById/struct.go b/iSolarCloud/AppService/deleteDeviceSimById/struct.go
index fcdbf4698..43666bcfa 100644
--- a/iSolarCloud/AppService/deleteDeviceSimById/struct.go
+++ b/iSolarCloud/AppService/deleteDeviceSimById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteElectricitySettlementData/data.go b/iSolarCloud/AppService/deleteElectricitySettlementData/data.go
index dfc5e2fa1..e5549c340 100644
--- a/iSolarCloud/AppService/deleteElectricitySettlementData/data.go
+++ b/iSolarCloud/AppService/deleteElectricitySettlementData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go b/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go
index a7b0b704a..ef4875fb0 100644
--- a/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go
+++ b/iSolarCloud/AppService/deleteElectricitySettlementData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteFaultPlan/data.go b/iSolarCloud/AppService/deleteFaultPlan/data.go
index ae2f7f319..25f986ce6 100644
--- a/iSolarCloud/AppService/deleteFaultPlan/data.go
+++ b/iSolarCloud/AppService/deleteFaultPlan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteFaultPlan/struct.go b/iSolarCloud/AppService/deleteFaultPlan/struct.go
index 0172a8f07..8142b0156 100644
--- a/iSolarCloud/AppService/deleteFaultPlan/struct.go
+++ b/iSolarCloud/AppService/deleteFaultPlan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteFirmwareFiles/data.go b/iSolarCloud/AppService/deleteFirmwareFiles/data.go
index ffacc4b70..bb73ecca5 100644
--- a/iSolarCloud/AppService/deleteFirmwareFiles/data.go
+++ b/iSolarCloud/AppService/deleteFirmwareFiles/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteFirmwareFiles/struct.go b/iSolarCloud/AppService/deleteFirmwareFiles/struct.go
index a612d054e..4327c5718 100644
--- a/iSolarCloud/AppService/deleteFirmwareFiles/struct.go
+++ b/iSolarCloud/AppService/deleteFirmwareFiles/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go b/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go
index 94457c1af..8537cb54e 100644
--- a/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go
+++ b/iSolarCloud/AppService/deleteHouseholdEvaluation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go b/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go
index 66068aa1d..6b58629a8 100644
--- a/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go
+++ b/iSolarCloud/AppService/deleteHouseholdEvaluation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go
index 5e83758a4..ccb63b97a 100644
--- a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go
+++ b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go
index 1ca7b3032..c8ffa1bf1 100644
--- a/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go
+++ b/iSolarCloud/AppService/deleteHouseholdLeaveMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go b/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go
index f34e74220..c6984fb83 100644
--- a/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go
+++ b/iSolarCloud/AppService/deleteHouseholdWorkOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go
index 134a2cf60..0e7619948 100644
--- a/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go
+++ b/iSolarCloud/AppService/deleteHouseholdWorkOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go b/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go
index e49865b6d..68a99babe 100644
--- a/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go
+++ b/iSolarCloud/AppService/deleteInverterSnInChnnl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go b/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go
index 9f6cb4b17..292bc7dff 100644
--- a/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go
+++ b/iSolarCloud/AppService/deleteInverterSnInChnnl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteModuleLog/data.go b/iSolarCloud/AppService/deleteModuleLog/data.go
index f72a5dfed..a75ad37b2 100644
--- a/iSolarCloud/AppService/deleteModuleLog/data.go
+++ b/iSolarCloud/AppService/deleteModuleLog/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteModuleLog/struct.go b/iSolarCloud/AppService/deleteModuleLog/struct.go
index 8de0de49b..c7c08c132 100644
--- a/iSolarCloud/AppService/deleteModuleLog/struct.go
+++ b/iSolarCloud/AppService/deleteModuleLog/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteOnDutyInfo/data.go b/iSolarCloud/AppService/deleteOnDutyInfo/data.go
index e82369692..ca0a0a763 100644
--- a/iSolarCloud/AppService/deleteOnDutyInfo/data.go
+++ b/iSolarCloud/AppService/deleteOnDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteOnDutyInfo/struct.go b/iSolarCloud/AppService/deleteOnDutyInfo/struct.go
index 48ecf7493..94beafc30 100644
--- a/iSolarCloud/AppService/deleteOnDutyInfo/struct.go
+++ b/iSolarCloud/AppService/deleteOnDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteOperateBillFile/data.go b/iSolarCloud/AppService/deleteOperateBillFile/data.go
index 3fdca2504..06c6cc127 100644
--- a/iSolarCloud/AppService/deleteOperateBillFile/data.go
+++ b/iSolarCloud/AppService/deleteOperateBillFile/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteOperateBillFile/struct.go b/iSolarCloud/AppService/deleteOperateBillFile/struct.go
index 2f43d696c..61d13766e 100644
--- a/iSolarCloud/AppService/deleteOperateBillFile/struct.go
+++ b/iSolarCloud/AppService/deleteOperateBillFile/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteOssObject/data.go b/iSolarCloud/AppService/deleteOssObject/data.go
index cb5599efa..b16ec716b 100644
--- a/iSolarCloud/AppService/deleteOssObject/data.go
+++ b/iSolarCloud/AppService/deleteOssObject/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteOssObject/struct.go b/iSolarCloud/AppService/deleteOssObject/struct.go
index 91ab82050..4169fa153 100644
--- a/iSolarCloud/AppService/deleteOssObject/struct.go
+++ b/iSolarCloud/AppService/deleteOssObject/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deletePowerDevicePointById/data.go b/iSolarCloud/AppService/deletePowerDevicePointById/data.go
index 1fa6f1cc8..f9eb04b3d 100644
--- a/iSolarCloud/AppService/deletePowerDevicePointById/data.go
+++ b/iSolarCloud/AppService/deletePowerDevicePointById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deletePowerDevicePointById/struct.go b/iSolarCloud/AppService/deletePowerDevicePointById/struct.go
index 9e33c29a6..da0a8bd7d 100644
--- a/iSolarCloud/AppService/deletePowerDevicePointById/struct.go
+++ b/iSolarCloud/AppService/deletePowerDevicePointById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deletePowerPicture/data.go b/iSolarCloud/AppService/deletePowerPicture/data.go
index d6670cb94..b1d98b784 100644
--- a/iSolarCloud/AppService/deletePowerPicture/data.go
+++ b/iSolarCloud/AppService/deletePowerPicture/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deletePowerPicture/struct.go b/iSolarCloud/AppService/deletePowerPicture/struct.go
index 875ad7579..629ec8de5 100644
--- a/iSolarCloud/AppService/deletePowerPicture/struct.go
+++ b/iSolarCloud/AppService/deletePowerPicture/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go
index af3f64880..299506496 100644
--- a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go
+++ b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go
index e8405b5cd..38bee5ba4 100644
--- a/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go
+++ b/iSolarCloud/AppService/deletePowerRobotInfoBySnAndPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go
index 70c67d42e..37334e081 100644
--- a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go
+++ b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go
index b84c6c369..8cf13fab8 100644
--- a/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go
+++ b/iSolarCloud/AppService/deletePowerRobotSweepStrategy/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteProductionData/data.go b/iSolarCloud/AppService/deleteProductionData/data.go
index 912c1fde1..0ee0fa7c1 100644
--- a/iSolarCloud/AppService/deleteProductionData/data.go
+++ b/iSolarCloud/AppService/deleteProductionData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteProductionData/struct.go b/iSolarCloud/AppService/deleteProductionData/struct.go
index 9a0f43052..80112da7f 100644
--- a/iSolarCloud/AppService/deleteProductionData/struct.go
+++ b/iSolarCloud/AppService/deleteProductionData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deletePs/data.go b/iSolarCloud/AppService/deletePs/data.go
index 50d2710f0..4d936af47 100644
--- a/iSolarCloud/AppService/deletePs/data.go
+++ b/iSolarCloud/AppService/deletePs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deletePs/struct.go b/iSolarCloud/AppService/deletePs/struct.go
index 5e9090fb6..63b9229c3 100644
--- a/iSolarCloud/AppService/deletePs/struct.go
+++ b/iSolarCloud/AppService/deletePs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteRechargeOrder/data.go b/iSolarCloud/AppService/deleteRechargeOrder/data.go
index dd8c05e6f..dc9953410 100644
--- a/iSolarCloud/AppService/deleteRechargeOrder/data.go
+++ b/iSolarCloud/AppService/deleteRechargeOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteRechargeOrder/struct.go b/iSolarCloud/AppService/deleteRechargeOrder/struct.go
index 50003f8c5..407cd69bb 100644
--- a/iSolarCloud/AppService/deleteRechargeOrder/struct.go
+++ b/iSolarCloud/AppService/deleteRechargeOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go
index dad3b8a61..418f209d9 100644
--- a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go
+++ b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go
index e507b889a..847a804a0 100644
--- a/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go
+++ b/iSolarCloud/AppService/deleteRegularlyConnectionInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go b/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go
index 506900115..b44b52b65 100644
--- a/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go
+++ b/iSolarCloud/AppService/deleteReportConfigEmailAddr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go b/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go
index d530f8e98..916fd7da4 100644
--- a/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go
+++ b/iSolarCloud/AppService/deleteReportConfigEmailAddr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteSysAdvancedParam/data.go b/iSolarCloud/AppService/deleteSysAdvancedParam/data.go
index 3f9a0fb96..f697fed95 100644
--- a/iSolarCloud/AppService/deleteSysAdvancedParam/data.go
+++ b/iSolarCloud/AppService/deleteSysAdvancedParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go b/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go
index 49d7aa3ec..48741649b 100644
--- a/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go
+++ b/iSolarCloud/AppService/deleteSysAdvancedParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteSysOrgNew/data.go b/iSolarCloud/AppService/deleteSysOrgNew/data.go
index be7169d9c..71237ff2e 100644
--- a/iSolarCloud/AppService/deleteSysOrgNew/data.go
+++ b/iSolarCloud/AppService/deleteSysOrgNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteSysOrgNew/struct.go b/iSolarCloud/AppService/deleteSysOrgNew/struct.go
index daf044abf..d248421a0 100644
--- a/iSolarCloud/AppService/deleteSysOrgNew/struct.go
+++ b/iSolarCloud/AppService/deleteSysOrgNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteTemplate/data.go b/iSolarCloud/AppService/deleteTemplate/data.go
index be03c19d9..bcb2f5cbf 100644
--- a/iSolarCloud/AppService/deleteTemplate/data.go
+++ b/iSolarCloud/AppService/deleteTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteTemplate/struct.go b/iSolarCloud/AppService/deleteTemplate/struct.go
index 5cd1a9869..2940ca932 100644
--- a/iSolarCloud/AppService/deleteTemplate/struct.go
+++ b/iSolarCloud/AppService/deleteTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go b/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go
index 63c43668f..2177303fb 100644
--- a/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go
+++ b/iSolarCloud/AppService/deleteUserInfoAllByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go b/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go
index b862ca77d..62b44e2a5 100644
--- a/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go
+++ b/iSolarCloud/AppService/deleteUserInfoAllByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go
index 660048ef1..c40cb2a86 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go
index 4ce7bc676..9a5168c91 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteDeleteTime/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go
index 46585622b..043ca5e37 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteGetTime/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go
index e301e09ea..5ef389654 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteGetTime/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go
index 8ad023cf0..63306f589 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go
index a96186deb..74089d252 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteInsertTime/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go
index 8ce2a06df..527314076 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go
index 35c1f49af..ff784f1cc 100644
--- a/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go
+++ b/iSolarCloud/AppService/deviceInputDiscreteUpdateTime/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go b/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go
index 98f96dbf4..ed8acfccb 100644
--- a/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go
+++ b/iSolarCloud/AppService/devicePointsDataFromMySql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/deviceReplace/data.go b/iSolarCloud/AppService/deviceReplace/data.go
index 51e373d49..314a734e3 100644
--- a/iSolarCloud/AppService/deviceReplace/data.go
+++ b/iSolarCloud/AppService/deviceReplace/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/deviceReplace/struct.go b/iSolarCloud/AppService/deviceReplace/struct.go
index 2e3f99573..4da8488c4 100644
--- a/iSolarCloud/AppService/deviceReplace/struct.go
+++ b/iSolarCloud/AppService/deviceReplace/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/editDeviceRepair/data.go b/iSolarCloud/AppService/editDeviceRepair/data.go
index c401ea179..b65d29306 100644
--- a/iSolarCloud/AppService/editDeviceRepair/data.go
+++ b/iSolarCloud/AppService/editDeviceRepair/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/editDeviceRepair/struct.go b/iSolarCloud/AppService/editDeviceRepair/struct.go
index f46428a46..e13c2fbb4 100644
--- a/iSolarCloud/AppService/editDeviceRepair/struct.go
+++ b/iSolarCloud/AppService/editDeviceRepair/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/editOperRule/data.go b/iSolarCloud/AppService/editOperRule/data.go
index e1ec5fb45..b54ca90d5 100644
--- a/iSolarCloud/AppService/editOperRule/data.go
+++ b/iSolarCloud/AppService/editOperRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/editOperRule/struct.go b/iSolarCloud/AppService/editOperRule/struct.go
index b4650a37b..21c726b5f 100644
--- a/iSolarCloud/AppService/editOperRule/struct.go
+++ b/iSolarCloud/AppService/editOperRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/energyPovertyAlleviation/data.go b/iSolarCloud/AppService/energyPovertyAlleviation/data.go
index c44718e09..1b11abdc1 100644
--- a/iSolarCloud/AppService/energyPovertyAlleviation/data.go
+++ b/iSolarCloud/AppService/energyPovertyAlleviation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/energyPovertyAlleviation/struct.go b/iSolarCloud/AppService/energyPovertyAlleviation/struct.go
index dbdc291f7..56fe07122 100644
--- a/iSolarCloud/AppService/energyPovertyAlleviation/struct.go
+++ b/iSolarCloud/AppService/energyPovertyAlleviation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/energyTrend/data.go b/iSolarCloud/AppService/energyTrend/data.go
index 614f020d3..77c768096 100644
--- a/iSolarCloud/AppService/energyTrend/data.go
+++ b/iSolarCloud/AppService/energyTrend/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/energyTrend/struct.go b/iSolarCloud/AppService/energyTrend/struct.go
index e8e562bc0..82f4885d3 100644
--- a/iSolarCloud/AppService/energyTrend/struct.go
+++ b/iSolarCloud/AppService/energyTrend/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/exportParamSettingValPDF/data.go b/iSolarCloud/AppService/exportParamSettingValPDF/data.go
index b5d0075f2..f8f8ef6b5 100644
--- a/iSolarCloud/AppService/exportParamSettingValPDF/data.go
+++ b/iSolarCloud/AppService/exportParamSettingValPDF/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/exportParamSettingValPDF/struct.go b/iSolarCloud/AppService/exportParamSettingValPDF/struct.go
index 719da71a0..bce0bb237 100644
--- a/iSolarCloud/AppService/exportParamSettingValPDF/struct.go
+++ b/iSolarCloud/AppService/exportParamSettingValPDF/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/exportPlantReportPDF/data.go b/iSolarCloud/AppService/exportPlantReportPDF/data.go
index 1df214c94..d84823d58 100644
--- a/iSolarCloud/AppService/exportPlantReportPDF/data.go
+++ b/iSolarCloud/AppService/exportPlantReportPDF/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/exportPlantReportPDF/struct.go b/iSolarCloud/AppService/exportPlantReportPDF/struct.go
index 391b74e7c..b3400f294 100644
--- a/iSolarCloud/AppService/exportPlantReportPDF/struct.go
+++ b/iSolarCloud/AppService/exportPlantReportPDF/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/faultAutoClose/data.go b/iSolarCloud/AppService/faultAutoClose/data.go
index a9dfb7ac9..3f5a92039 100644
--- a/iSolarCloud/AppService/faultAutoClose/data.go
+++ b/iSolarCloud/AppService/faultAutoClose/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/faultAutoClose/struct.go b/iSolarCloud/AppService/faultAutoClose/struct.go
index 4a2080526..83b82a974 100644
--- a/iSolarCloud/AppService/faultAutoClose/struct.go
+++ b/iSolarCloud/AppService/faultAutoClose/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go b/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go
index c495af41c..83017c700 100644
--- a/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go
+++ b/iSolarCloud/AppService/faultCloseRemindOrderHandler/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go b/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go
index 9fb87d04d..aa117d673 100644
--- a/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go
+++ b/iSolarCloud/AppService/faultCloseRemindOrderHandler/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findCodeValueList/data.go b/iSolarCloud/AppService/findCodeValueList/data.go
index 1a8a8244a..c6e86f6ac 100644
--- a/iSolarCloud/AppService/findCodeValueList/data.go
+++ b/iSolarCloud/AppService/findCodeValueList/data.go
@@ -41,7 +41,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findCodeValueList/struct.go b/iSolarCloud/AppService/findCodeValueList/struct.go
index a20b01d72..4b41c7e6e 100644
--- a/iSolarCloud/AppService/findCodeValueList/struct.go
+++ b/iSolarCloud/AppService/findCodeValueList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findEmgOrgInfo/data.go b/iSolarCloud/AppService/findEmgOrgInfo/data.go
index 0efaee1a3..36a9b05ee 100644
--- a/iSolarCloud/AppService/findEmgOrgInfo/data.go
+++ b/iSolarCloud/AppService/findEmgOrgInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findEmgOrgInfo/struct.go b/iSolarCloud/AppService/findEmgOrgInfo/struct.go
index e6f3fb348..ab1644724 100644
--- a/iSolarCloud/AppService/findEmgOrgInfo/struct.go
+++ b/iSolarCloud/AppService/findEmgOrgInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findEnvironmentInfo/data.go b/iSolarCloud/AppService/findEnvironmentInfo/data.go
index 3110df5f9..b641fe6bf 100644
--- a/iSolarCloud/AppService/findEnvironmentInfo/data.go
+++ b/iSolarCloud/AppService/findEnvironmentInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findEnvironmentInfo/struct.go b/iSolarCloud/AppService/findEnvironmentInfo/struct.go
index 7323e898b..8f9a2f08d 100644
--- a/iSolarCloud/AppService/findEnvironmentInfo/struct.go
+++ b/iSolarCloud/AppService/findEnvironmentInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findFromHbaseAndRedis/data.go b/iSolarCloud/AppService/findFromHbaseAndRedis/data.go
index d4d6fa0c8..9ea370e28 100644
--- a/iSolarCloud/AppService/findFromHbaseAndRedis/data.go
+++ b/iSolarCloud/AppService/findFromHbaseAndRedis/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go b/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go
index 91a89d195..f2e17e9b1 100644
--- a/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go
+++ b/iSolarCloud/AppService/findFromHbaseAndRedis/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findInfoByuuid/data.go b/iSolarCloud/AppService/findInfoByuuid/data.go
index 549ee54e1..22ce49ebe 100644
--- a/iSolarCloud/AppService/findInfoByuuid/data.go
+++ b/iSolarCloud/AppService/findInfoByuuid/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findInfoByuuid/struct.go b/iSolarCloud/AppService/findInfoByuuid/struct.go
index 4f66550e7..443b8bb05 100644
--- a/iSolarCloud/AppService/findInfoByuuid/struct.go
+++ b/iSolarCloud/AppService/findInfoByuuid/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findLossAnalysisList/data.go b/iSolarCloud/AppService/findLossAnalysisList/data.go
index 6af28c842..9c607536c 100644
--- a/iSolarCloud/AppService/findLossAnalysisList/data.go
+++ b/iSolarCloud/AppService/findLossAnalysisList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findLossAnalysisList/struct.go b/iSolarCloud/AppService/findLossAnalysisList/struct.go
index a41d87dda..0c5bb94b7 100644
--- a/iSolarCloud/AppService/findLossAnalysisList/struct.go
+++ b/iSolarCloud/AppService/findLossAnalysisList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findOnDutyInfo/data.go b/iSolarCloud/AppService/findOnDutyInfo/data.go
index a50b35257..b703a25fe 100644
--- a/iSolarCloud/AppService/findOnDutyInfo/data.go
+++ b/iSolarCloud/AppService/findOnDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findOnDutyInfo/struct.go b/iSolarCloud/AppService/findOnDutyInfo/struct.go
index 3842682be..5c4f29a19 100644
--- a/iSolarCloud/AppService/findOnDutyInfo/struct.go
+++ b/iSolarCloud/AppService/findOnDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findPsType/struct.go b/iSolarCloud/AppService/findPsType/struct.go
index a8349f8f5..90a70ad9f 100644
--- a/iSolarCloud/AppService/findPsType/struct.go
+++ b/iSolarCloud/AppService/findPsType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findSingleStationPR/data.go b/iSolarCloud/AppService/findSingleStationPR/data.go
index 2af3cc3f7..05f139212 100644
--- a/iSolarCloud/AppService/findSingleStationPR/data.go
+++ b/iSolarCloud/AppService/findSingleStationPR/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findSingleStationPR/struct.go b/iSolarCloud/AppService/findSingleStationPR/struct.go
index 478a49683..ff9895748 100644
--- a/iSolarCloud/AppService/findSingleStationPR/struct.go
+++ b/iSolarCloud/AppService/findSingleStationPR/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/findUserPassword/data.go b/iSolarCloud/AppService/findUserPassword/data.go
index 9883fb65e..49bf65b06 100644
--- a/iSolarCloud/AppService/findUserPassword/data.go
+++ b/iSolarCloud/AppService/findUserPassword/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/findUserPassword/struct.go b/iSolarCloud/AppService/findUserPassword/struct.go
index f8b231080..5ecd5ac58 100644
--- a/iSolarCloud/AppService/findUserPassword/struct.go
+++ b/iSolarCloud/AppService/findUserPassword/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go b/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go
index cb9b03ccb..5f6b4bf77 100644
--- a/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go
+++ b/iSolarCloud/AppService/genTLSUserSigByUserAccount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go b/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go
index d26c54b86..51e117122 100644
--- a/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go
+++ b/iSolarCloud/AppService/genTLSUserSigByUserAccount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/generateRandomPassword/data.go b/iSolarCloud/AppService/generateRandomPassword/data.go
index 5be574ca7..3c02dd1e9 100644
--- a/iSolarCloud/AppService/generateRandomPassword/data.go
+++ b/iSolarCloud/AppService/generateRandomPassword/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/generateRandomPassword/struct.go b/iSolarCloud/AppService/generateRandomPassword/struct.go
index a26cd4200..35e61f8b8 100644
--- a/iSolarCloud/AppService/generateRandomPassword/struct.go
+++ b/iSolarCloud/AppService/generateRandomPassword/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAPIServiceInfo/data.go b/iSolarCloud/AppService/getAPIServiceInfo/data.go
index 35fcc5216..7b14d4074 100644
--- a/iSolarCloud/AppService/getAPIServiceInfo/data.go
+++ b/iSolarCloud/AppService/getAPIServiceInfo/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAPIServiceInfo/struct.go b/iSolarCloud/AppService/getAPIServiceInfo/struct.go
index 450b8440d..6af17e5c3 100644
--- a/iSolarCloud/AppService/getAPIServiceInfo/struct.go
+++ b/iSolarCloud/AppService/getAPIServiceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAccessedPermission/data.go b/iSolarCloud/AppService/getAccessedPermission/data.go
index 30e9ca387..0d12a9484 100644
--- a/iSolarCloud/AppService/getAccessedPermission/data.go
+++ b/iSolarCloud/AppService/getAccessedPermission/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAccessedPermission/struct.go b/iSolarCloud/AppService/getAccessedPermission/struct.go
index 6f2b76900..667d20af5 100644
--- a/iSolarCloud/AppService/getAccessedPermission/struct.go
+++ b/iSolarCloud/AppService/getAccessedPermission/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAllDeviceByPsId/struct.go b/iSolarCloud/AppService/getAllDeviceByPsId/struct.go
index de4fd8400..9fe59a84b 100644
--- a/iSolarCloud/AppService/getAllDeviceByPsId/struct.go
+++ b/iSolarCloud/AppService/getAllDeviceByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go b/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go
index ce07466c6..36ba7eca3 100644
--- a/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go
+++ b/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go b/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go
index f9031c377..185896cf2 100644
--- a/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go
+++ b/iSolarCloud/AppService/getAllPowerDeviceSetName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go
index fe38fa6dd..a3a07a86f 100644
--- a/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go
+++ b/iSolarCloud/AppService/getAllPowerRobotViewInfoByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go b/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go
index f9984c304..d0465b242 100644
--- a/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go
+++ b/iSolarCloud/AppService/getAllPsIdByOrgIds/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAllUserRemindCount/data.go b/iSolarCloud/AppService/getAllUserRemindCount/data.go
index ec9ed55ee..7f2b830d6 100644
--- a/iSolarCloud/AppService/getAllUserRemindCount/data.go
+++ b/iSolarCloud/AppService/getAllUserRemindCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAllUserRemindCount/struct.go b/iSolarCloud/AppService/getAllUserRemindCount/struct.go
index 94b9903b5..f90607115 100644
--- a/iSolarCloud/AppService/getAllUserRemindCount/struct.go
+++ b/iSolarCloud/AppService/getAllUserRemindCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAndOutletsAndUnit/data.go b/iSolarCloud/AppService/getAndOutletsAndUnit/data.go
index 50b0d4363..6cfd7fd6e 100644
--- a/iSolarCloud/AppService/getAndOutletsAndUnit/data.go
+++ b/iSolarCloud/AppService/getAndOutletsAndUnit/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go b/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go
index 6a2316748..d218f9aa6 100644
--- a/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go
+++ b/iSolarCloud/AppService/getAndOutletsAndUnit/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getApiCallsForAppkeys/data.go b/iSolarCloud/AppService/getApiCallsForAppkeys/data.go
index ca6a7f80e..551f99905 100644
--- a/iSolarCloud/AppService/getApiCallsForAppkeys/data.go
+++ b/iSolarCloud/AppService/getApiCallsForAppkeys/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go b/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go
index a61d51864..75590dad5 100644
--- a/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go
+++ b/iSolarCloud/AppService/getApiCallsForAppkeys/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go b/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go
index 74e589e49..0b8ca7cfc 100644
--- a/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go
+++ b/iSolarCloud/AppService/getAreaInfoCodeByCounty/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go b/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go
index 613afb402..0613cf689 100644
--- a/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go
+++ b/iSolarCloud/AppService/getAreaInfoCodeByCounty/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAreaList/data.go b/iSolarCloud/AppService/getAreaList/data.go
index 737eae230..a2f20f4f8 100644
--- a/iSolarCloud/AppService/getAreaList/data.go
+++ b/iSolarCloud/AppService/getAreaList/data.go
@@ -38,7 +38,7 @@ type ResultData struct {
StationCount valueTypes.Integer `json:"station_count"`
TodayEnergy valueTypes.UnitValue `json:"today_energy"`
TotalEnergy valueTypes.UnitValue `json:"total_energy"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"OrgId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"OrgId" PointIdReplace:"true" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count" PointIgnore:"true"`
}
@@ -51,7 +51,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAreaList/struct.go b/iSolarCloud/AppService/getAreaList/struct.go
index 862c89d02..979b3f277 100644
--- a/iSolarCloud/AppService/getAreaList/struct.go
+++ b/iSolarCloud/AppService/getAreaList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getAutoCreatePowerStation/data.go b/iSolarCloud/AppService/getAutoCreatePowerStation/data.go
index 91f6100bc..276c2a758 100644
--- a/iSolarCloud/AppService/getAutoCreatePowerStation/data.go
+++ b/iSolarCloud/AppService/getAutoCreatePowerStation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go b/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go
index e7442914b..bef8f4d7e 100644
--- a/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go
+++ b/iSolarCloud/AppService/getAutoCreatePowerStation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getBackReadValue/data.go b/iSolarCloud/AppService/getBackReadValue/data.go
index 113541be0..ac96abc82 100644
--- a/iSolarCloud/AppService/getBackReadValue/data.go
+++ b/iSolarCloud/AppService/getBackReadValue/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getBackReadValue/struct.go b/iSolarCloud/AppService/getBackReadValue/struct.go
index d7ce57587..1fb74b478 100644
--- a/iSolarCloud/AppService/getBackReadValue/struct.go
+++ b/iSolarCloud/AppService/getBackReadValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getBatchNewestPointData/data.go b/iSolarCloud/AppService/getBatchNewestPointData/data.go
index 2dd728f2c..6203b97da 100644
--- a/iSolarCloud/AppService/getBatchNewestPointData/data.go
+++ b/iSolarCloud/AppService/getBatchNewestPointData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getBatchNewestPointData/struct.go b/iSolarCloud/AppService/getBatchNewestPointData/struct.go
index 0aa4fae13..1a617262a 100644
--- a/iSolarCloud/AppService/getBatchNewestPointData/struct.go
+++ b/iSolarCloud/AppService/getBatchNewestPointData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCallApiResidueTimes/data.go b/iSolarCloud/AppService/getCallApiResidueTimes/data.go
index df054124f..49c209b3d 100644
--- a/iSolarCloud/AppService/getCallApiResidueTimes/data.go
+++ b/iSolarCloud/AppService/getCallApiResidueTimes/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCallApiResidueTimes/struct.go b/iSolarCloud/AppService/getCallApiResidueTimes/struct.go
index 97ba44df5..c3e2534ca 100644
--- a/iSolarCloud/AppService/getCallApiResidueTimes/struct.go
+++ b/iSolarCloud/AppService/getCallApiResidueTimes/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getChangedPsListByTime/data.go b/iSolarCloud/AppService/getChangedPsListByTime/data.go
index bef8a28f6..05f9973fc 100644
--- a/iSolarCloud/AppService/getChangedPsListByTime/data.go
+++ b/iSolarCloud/AppService/getChangedPsListByTime/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getChangedPsListByTime/struct.go b/iSolarCloud/AppService/getChangedPsListByTime/struct.go
index c94183b81..2a9638b05 100644
--- a/iSolarCloud/AppService/getChangedPsListByTime/struct.go
+++ b/iSolarCloud/AppService/getChangedPsListByTime/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getChnnlListByPsId/struct.go b/iSolarCloud/AppService/getChnnlListByPsId/struct.go
index 11e7c12ab..4600807a3 100644
--- a/iSolarCloud/AppService/getChnnlListByPsId/struct.go
+++ b/iSolarCloud/AppService/getChnnlListByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCloudList/data.go b/iSolarCloud/AppService/getCloudList/data.go
index 77f0888c4..000a03967 100644
--- a/iSolarCloud/AppService/getCloudList/data.go
+++ b/iSolarCloud/AppService/getCloudList/data.go
@@ -108,7 +108,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCloudList/struct.go b/iSolarCloud/AppService/getCloudList/struct.go
index 97fe44668..df21fd638 100644
--- a/iSolarCloud/AppService/getCloudList/struct.go
+++ b/iSolarCloud/AppService/getCloudList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go b/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go
index cc308679b..952c213ca 100644
--- a/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go
+++ b/iSolarCloud/AppService/getCloudServiceMappingConfig/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go b/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go
index 3c0a844a9..1cdd2c524 100644
--- a/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go
+++ b/iSolarCloud/AppService/getCloudServiceMappingConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go
index bc19cbc52..ba8b0f8df 100644
--- a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go
+++ b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go
index 388bf926e..7fa0ea786 100644
--- a/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go
+++ b/iSolarCloud/AppService/getCommunicationDeviceConfigInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go b/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go
index 49dcb5346..2d6e40ed3 100644
--- a/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go
+++ b/iSolarCloud/AppService/getCommunicationModuleMonitorData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go b/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go
index e23c5dba1..abb2f7b68 100644
--- a/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go
+++ b/iSolarCloud/AppService/getCommunicationModuleMonitorData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getComponentModelFactory/data.go b/iSolarCloud/AppService/getComponentModelFactory/data.go
index 91e005c16..a1b2dc6e2 100644
--- a/iSolarCloud/AppService/getComponentModelFactory/data.go
+++ b/iSolarCloud/AppService/getComponentModelFactory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getComponentModelFactory/struct.go b/iSolarCloud/AppService/getComponentModelFactory/struct.go
index 76648b195..666625e4a 100644
--- a/iSolarCloud/AppService/getComponentModelFactory/struct.go
+++ b/iSolarCloud/AppService/getComponentModelFactory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getConfigList/data.go b/iSolarCloud/AppService/getConfigList/data.go
index cf772af0e..91c8fdf44 100644
--- a/iSolarCloud/AppService/getConfigList/data.go
+++ b/iSolarCloud/AppService/getConfigList/data.go
@@ -56,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getConfigList/struct.go b/iSolarCloud/AppService/getConfigList/struct.go
index ece9e39dd..6f7ceff84 100644
--- a/iSolarCloud/AppService/getConfigList/struct.go
+++ b/iSolarCloud/AppService/getConfigList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go
index d0c27b7c7..8a5f9322f 100644
--- a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go
+++ b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go
index b4a166fd3..1303f70fe 100644
--- a/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go
+++ b/iSolarCloud/AppService/getConnectionInfoBySnAndLocalPort/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCountDown/data.go b/iSolarCloud/AppService/getCountDown/data.go
index 813a118ba..3d6f9586e 100644
--- a/iSolarCloud/AppService/getCountDown/data.go
+++ b/iSolarCloud/AppService/getCountDown/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCountDown/struct.go b/iSolarCloud/AppService/getCountDown/struct.go
index 9b53bafd6..197a6a2c9 100644
--- a/iSolarCloud/AppService/getCountDown/struct.go
+++ b/iSolarCloud/AppService/getCountDown/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCountryServiceInfo/data.go b/iSolarCloud/AppService/getCountryServiceInfo/data.go
index 2a821a559..21884c14a 100644
--- a/iSolarCloud/AppService/getCountryServiceInfo/data.go
+++ b/iSolarCloud/AppService/getCountryServiceInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCountryServiceInfo/struct.go b/iSolarCloud/AppService/getCountryServiceInfo/struct.go
index 257601be2..a46d8d657 100644
--- a/iSolarCloud/AppService/getCountryServiceInfo/struct.go
+++ b/iSolarCloud/AppService/getCountryServiceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCounty/data.go b/iSolarCloud/AppService/getCounty/data.go
index e96412c21..a4be41d72 100644
--- a/iSolarCloud/AppService/getCounty/data.go
+++ b/iSolarCloud/AppService/getCounty/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCounty/struct.go b/iSolarCloud/AppService/getCounty/struct.go
index 0ab686e7a..f9dc43ba4 100644
--- a/iSolarCloud/AppService/getCounty/struct.go
+++ b/iSolarCloud/AppService/getCounty/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCustomerEmployee/data.go b/iSolarCloud/AppService/getCustomerEmployee/data.go
index daceebcf1..b8377639a 100644
--- a/iSolarCloud/AppService/getCustomerEmployee/data.go
+++ b/iSolarCloud/AppService/getCustomerEmployee/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCustomerEmployee/struct.go b/iSolarCloud/AppService/getCustomerEmployee/struct.go
index 8ffbb657c..b40b2a7c8 100644
--- a/iSolarCloud/AppService/getCustomerEmployee/struct.go
+++ b/iSolarCloud/AppService/getCustomerEmployee/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getCustomerList/data.go b/iSolarCloud/AppService/getCustomerList/data.go
index 7d7929ed2..e46d7a620 100644
--- a/iSolarCloud/AppService/getCustomerList/data.go
+++ b/iSolarCloud/AppService/getCustomerList/data.go
@@ -41,7 +41,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getCustomerList/struct.go b/iSolarCloud/AppService/getCustomerList/struct.go
index 18d655184..5acd9264b 100644
--- a/iSolarCloud/AppService/getCustomerList/struct.go
+++ b/iSolarCloud/AppService/getCustomerList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDataFromHBase/data.go b/iSolarCloud/AppService/getDataFromHBase/data.go
index 65bdadb12..725e23af6 100644
--- a/iSolarCloud/AppService/getDataFromHBase/data.go
+++ b/iSolarCloud/AppService/getDataFromHBase/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDataFromHBase/struct.go b/iSolarCloud/AppService/getDataFromHBase/struct.go
index 0442a77e4..78b5e5b26 100644
--- a/iSolarCloud/AppService/getDataFromHBase/struct.go
+++ b/iSolarCloud/AppService/getDataFromHBase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go b/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go
index 8aa7fa471..e473821fe 100644
--- a/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go
+++ b/iSolarCloud/AppService/getDataFromHbaseByRowKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go b/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go
index e55b0fffb..f80aef324 100644
--- a/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go
+++ b/iSolarCloud/AppService/getDataFromHbaseByRowKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go b/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go
index 0371534bc..69dbc3aed 100644
--- a/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go
+++ b/iSolarCloud/AppService/getDevInstalledPowerByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go b/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go
index b3180221d..30b919a44 100644
--- a/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go
+++ b/iSolarCloud/AppService/getDevInstalledPowerByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevRecord/data.go b/iSolarCloud/AppService/getDevRecord/data.go
index 91e4f39fb..7de5b6be7 100644
--- a/iSolarCloud/AppService/getDevRecord/data.go
+++ b/iSolarCloud/AppService/getDevRecord/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevRecord/struct.go b/iSolarCloud/AppService/getDevRecord/struct.go
index ba5e10a9e..8eed99f1c 100644
--- a/iSolarCloud/AppService/getDevRecord/struct.go
+++ b/iSolarCloud/AppService/getDevRecord/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevRunRecordList/data.go b/iSolarCloud/AppService/getDevRunRecordList/data.go
index 6ec6a2623..8a27f9101 100644
--- a/iSolarCloud/AppService/getDevRunRecordList/data.go
+++ b/iSolarCloud/AppService/getDevRunRecordList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevRunRecordList/struct.go b/iSolarCloud/AppService/getDevRunRecordList/struct.go
index 29495c22f..319cabe57 100644
--- a/iSolarCloud/AppService/getDevRunRecordList/struct.go
+++ b/iSolarCloud/AppService/getDevRunRecordList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevSimByList/data.go b/iSolarCloud/AppService/getDevSimByList/data.go
index 51dbc90a5..55f6b09ae 100644
--- a/iSolarCloud/AppService/getDevSimByList/data.go
+++ b/iSolarCloud/AppService/getDevSimByList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevSimByList/struct.go b/iSolarCloud/AppService/getDevSimByList/struct.go
index 9f9a34ec3..73f42cb73 100644
--- a/iSolarCloud/AppService/getDevSimByList/struct.go
+++ b/iSolarCloud/AppService/getDevSimByList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevSimList/data.go b/iSolarCloud/AppService/getDevSimList/data.go
index ae65a1b56..4379d87d9 100644
--- a/iSolarCloud/AppService/getDevSimList/data.go
+++ b/iSolarCloud/AppService/getDevSimList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevSimList/struct.go b/iSolarCloud/AppService/getDevSimList/struct.go
index afbb8fe42..e943a87cd 100644
--- a/iSolarCloud/AppService/getDevSimList/struct.go
+++ b/iSolarCloud/AppService/getDevSimList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceAccountById/data.go b/iSolarCloud/AppService/getDeviceAccountById/data.go
index 9530602c0..fe2226a9e 100644
--- a/iSolarCloud/AppService/getDeviceAccountById/data.go
+++ b/iSolarCloud/AppService/getDeviceAccountById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceAccountById/struct.go b/iSolarCloud/AppService/getDeviceAccountById/struct.go
index 195941215..172961664 100644
--- a/iSolarCloud/AppService/getDeviceAccountById/struct.go
+++ b/iSolarCloud/AppService/getDeviceAccountById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go b/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go
index 5a633c893..a92276d44 100644
--- a/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go
+++ b/iSolarCloud/AppService/getDeviceFaultStatisticsData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go b/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go
index 811621143..f42dc352b 100644
--- a/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go
+++ b/iSolarCloud/AppService/getDeviceFaultStatisticsData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceInfo/data.go b/iSolarCloud/AppService/getDeviceInfo/data.go
index 1dd213a47..e70d01c37 100644
--- a/iSolarCloud/AppService/getDeviceInfo/data.go
+++ b/iSolarCloud/AppService/getDeviceInfo/data.go
@@ -37,7 +37,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceInfo/struct.go b/iSolarCloud/AppService/getDeviceInfo/struct.go
index 859187954..038e67fe6 100644
--- a/iSolarCloud/AppService/getDeviceInfo/struct.go
+++ b/iSolarCloud/AppService/getDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go
index 23eb27a54..7b507ca89 100644
--- a/iSolarCloud/AppService/getDeviceList/data.go
+++ b/iSolarCloud/AppService/getDeviceList/data.go
@@ -27,6 +27,8 @@ func (rd RequestData) Help() string {
type ResultData struct {
PageList []struct {
+ GoStructParent GoStruct.GoStructParent `json:"-" PointDeviceFrom:"PsKey"`
+
AttrId valueTypes.Integer `json:"attr_id"`
ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"`
CommandStatus valueTypes.Integer `json:"command_status"`
@@ -71,18 +73,12 @@ type ResultData struct {
Sn valueTypes.String `json:"sn" PointName:"Serial Number"`
TypeName valueTypes.String `json:"type_name"`
UUID valueTypes.Integer `json:"uuid"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsKey" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
- RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count" PointIgnore:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsKey" PointIdReplace:"true"`
+ RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
func (e *ResultData) IsValid() error {
var err error
- //switch {
- //case e.Dummy == "":
- // break
- //default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- //}
return err
}
@@ -278,9 +274,6 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.PsId.String()
entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
}
diff --git a/iSolarCloud/AppService/getDeviceList/struct.go b/iSolarCloud/AppService/getDeviceList/struct.go
index 7d0391c93..9df11ed5a 100644
--- a/iSolarCloud/AppService/getDeviceList/struct.go
+++ b/iSolarCloud/AppService/getDeviceList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/data.go b/iSolarCloud/AppService/getDeviceModelInfoList/data.go
index bcf27473b..ff52bcc7f 100644
--- a/iSolarCloud/AppService/getDeviceModelInfoList/data.go
+++ b/iSolarCloud/AppService/getDeviceModelInfoList/data.go
@@ -115,7 +115,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/struct.go b/iSolarCloud/AppService/getDeviceModelInfoList/struct.go
index 06d7e7113..58426f536 100644
--- a/iSolarCloud/AppService/getDeviceModelInfoList/struct.go
+++ b/iSolarCloud/AppService/getDeviceModelInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
index d7c5ddd64..a02cb6f6a 100644
--- a/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
+++ b/iSolarCloud/AppService/getDevicePointMinuteDataList/data.go
@@ -4,15 +4,16 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/commonService/getDevicePointMinuteDataList"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
+ PsKey valueTypes.PsKey `json:"ps_key" required:"true"`
+ Points valueTypes.String `json:"points" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -34,30 +35,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go b/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go
index 7b4c2fefe..0a858d8f0 100644
--- a/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go
+++ b/iSolarCloud/AppService/getDevicePointMinuteDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevicePoints/data.go b/iSolarCloud/AppService/getDevicePoints/data.go
index 843f5e7c9..a37c5c06f 100644
--- a/iSolarCloud/AppService/getDevicePoints/data.go
+++ b/iSolarCloud/AppService/getDevicePoints/data.go
@@ -61,7 +61,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevicePoints/struct.go b/iSolarCloud/AppService/getDevicePoints/struct.go
index 69ca17c09..8c39a532a 100644
--- a/iSolarCloud/AppService/getDevicePoints/struct.go
+++ b/iSolarCloud/AppService/getDevicePoints/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDevicePropertys/data.go b/iSolarCloud/AppService/getDevicePropertys/data.go
index b12ec70d3..5dd5d6f5b 100644
--- a/iSolarCloud/AppService/getDevicePropertys/data.go
+++ b/iSolarCloud/AppService/getDevicePropertys/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDevicePropertys/struct.go b/iSolarCloud/AppService/getDevicePropertys/struct.go
index c0dd6a8d1..7df070f4a 100644
--- a/iSolarCloud/AppService/getDevicePropertys/struct.go
+++ b/iSolarCloud/AppService/getDevicePropertys/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceRepairDetail/data.go b/iSolarCloud/AppService/getDeviceRepairDetail/data.go
index 64cb34502..3463f7542 100644
--- a/iSolarCloud/AppService/getDeviceRepairDetail/data.go
+++ b/iSolarCloud/AppService/getDeviceRepairDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceRepairDetail/struct.go b/iSolarCloud/AppService/getDeviceRepairDetail/struct.go
index d3192af43..f1aadb9a8 100644
--- a/iSolarCloud/AppService/getDeviceRepairDetail/struct.go
+++ b/iSolarCloud/AppService/getDeviceRepairDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceTechBranchCount/data.go b/iSolarCloud/AppService/getDeviceTechBranchCount/data.go
index 763458ee1..68b1bacc0 100644
--- a/iSolarCloud/AppService/getDeviceTechBranchCount/data.go
+++ b/iSolarCloud/AppService/getDeviceTechBranchCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go b/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go
index f163b7adc..4080694f2 100644
--- a/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go
+++ b/iSolarCloud/AppService/getDeviceTechBranchCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
index 6cced4e04..c7e03937b 100644
--- a/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
+++ b/iSolarCloud/AppService/getDeviceTypeInfoList/data.go
@@ -64,7 +64,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go b/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go
index 6011fb31b..610270769 100644
--- a/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go
+++ b/iSolarCloud/AppService/getDeviceTypeInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getDeviceTypeList/data.go b/iSolarCloud/AppService/getDeviceTypeList/data.go
index da93cec24..00f36a67a 100644
--- a/iSolarCloud/AppService/getDeviceTypeList/data.go
+++ b/iSolarCloud/AppService/getDeviceTypeList/data.go
@@ -4,8 +4,8 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/devService/getDeviceTypeList"
@@ -33,39 +33,15 @@ type ResultData struct {
func (e *ResultData) IsValid() error {
var err error
- //switch {
- //case e.Dummy == "":
- // break
- //default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- //}
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDeviceTypeList/struct.go b/iSolarCloud/AppService/getDeviceTypeList/struct.go
index d29b45bbc..ced19514e 100644
--- a/iSolarCloud/AppService/getDeviceTypeList/struct.go
+++ b/iSolarCloud/AppService/getDeviceTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
@@ -390,3 +390,7 @@ func (e EndPoint) ResultDataRef() ResultData {
return e.Response.ResultData
}
+// GetFilename - Get filename based file type.
+// func (e EndPoint) GetFilename(Type string) string {
+// return e.ApiSetFilenamePrefix(format, args...)
+// }
diff --git a/iSolarCloud/AppService/getDstInfo/data.go b/iSolarCloud/AppService/getDstInfo/data.go
index cc7a5fbf3..6b2fbe4ec 100644
--- a/iSolarCloud/AppService/getDstInfo/data.go
+++ b/iSolarCloud/AppService/getDstInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getDstInfo/struct.go b/iSolarCloud/AppService/getDstInfo/struct.go
index 633311f5f..a83f8920c 100644
--- a/iSolarCloud/AppService/getDstInfo/struct.go
+++ b/iSolarCloud/AppService/getDstInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getElectricitySettlementData/data.go b/iSolarCloud/AppService/getElectricitySettlementData/data.go
index 83bc6692e..65ce81506 100644
--- a/iSolarCloud/AppService/getElectricitySettlementData/data.go
+++ b/iSolarCloud/AppService/getElectricitySettlementData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getElectricitySettlementData/struct.go b/iSolarCloud/AppService/getElectricitySettlementData/struct.go
index 3d6903e65..1c69e179b 100644
--- a/iSolarCloud/AppService/getElectricitySettlementData/struct.go
+++ b/iSolarCloud/AppService/getElectricitySettlementData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go b/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go
index 69fa37875..601fbaf54 100644
--- a/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go
+++ b/iSolarCloud/AppService/getElectricitySettlementDetailData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go b/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go
index 8be58fa59..7d2a72529 100644
--- a/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go
+++ b/iSolarCloud/AppService/getElectricitySettlementDetailData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getEncryptPublicKey/data.go b/iSolarCloud/AppService/getEncryptPublicKey/data.go
index 29d08ecfe..e5ccc4c0f 100644
--- a/iSolarCloud/AppService/getEncryptPublicKey/data.go
+++ b/iSolarCloud/AppService/getEncryptPublicKey/data.go
@@ -60,7 +60,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getEncryptPublicKey/struct.go b/iSolarCloud/AppService/getEncryptPublicKey/struct.go
index ebcef4b4a..8b9a93eb8 100644
--- a/iSolarCloud/AppService/getEncryptPublicKey/struct.go
+++ b/iSolarCloud/AppService/getEncryptPublicKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultCount/data.go b/iSolarCloud/AppService/getFaultCount/data.go
index 7cb9888a9..c5d71b207 100644
--- a/iSolarCloud/AppService/getFaultCount/data.go
+++ b/iSolarCloud/AppService/getFaultCount/data.go
@@ -61,7 +61,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultCount/struct.go b/iSolarCloud/AppService/getFaultCount/struct.go
index 9b000a3f8..6043b254e 100644
--- a/iSolarCloud/AppService/getFaultCount/struct.go
+++ b/iSolarCloud/AppService/getFaultCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultDetail/data.go b/iSolarCloud/AppService/getFaultDetail/data.go
index dd45b0edf..931a458f1 100644
--- a/iSolarCloud/AppService/getFaultDetail/data.go
+++ b/iSolarCloud/AppService/getFaultDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultDetail/struct.go b/iSolarCloud/AppService/getFaultDetail/struct.go
index d22e0397e..7f3960c9a 100644
--- a/iSolarCloud/AppService/getFaultDetail/struct.go
+++ b/iSolarCloud/AppService/getFaultDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go b/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go
index dbf921233..937f11f12 100644
--- a/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go
+++ b/iSolarCloud/AppService/getFaultMsgByFaultCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go b/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go
index 63ad9bedc..c83adea44 100644
--- a/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go
+++ b/iSolarCloud/AppService/getFaultMsgByFaultCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go
index 00a50f247..bae296654 100644
--- a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go
+++ b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go
index 23da4859d..3c484a741 100644
--- a/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go
+++ b/iSolarCloud/AppService/getFaultMsgListByPageWithYYYYMM/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
index b1da39770..8a137c2a3 100644
--- a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
+++ b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
@@ -72,7 +72,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go
index a6b3ff0ae..0ecf327f8 100644
--- a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go
+++ b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFaultPlanList/data.go b/iSolarCloud/AppService/getFaultPlanList/data.go
index f6a0ce7d4..be70cd3f4 100644
--- a/iSolarCloud/AppService/getFaultPlanList/data.go
+++ b/iSolarCloud/AppService/getFaultPlanList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFaultPlanList/struct.go b/iSolarCloud/AppService/getFaultPlanList/struct.go
index 521975257..e6dedf29b 100644
--- a/iSolarCloud/AppService/getFaultPlanList/struct.go
+++ b/iSolarCloud/AppService/getFaultPlanList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFileOperationRecordOne/data.go b/iSolarCloud/AppService/getFileOperationRecordOne/data.go
index 1ab909dc7..a650f6ee0 100644
--- a/iSolarCloud/AppService/getFileOperationRecordOne/data.go
+++ b/iSolarCloud/AppService/getFileOperationRecordOne/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFileOperationRecordOne/struct.go b/iSolarCloud/AppService/getFileOperationRecordOne/struct.go
index d8f2e7553..032ff1b47 100644
--- a/iSolarCloud/AppService/getFileOperationRecordOne/struct.go
+++ b/iSolarCloud/AppService/getFileOperationRecordOne/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go b/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go
index 98b2a9fd0..426e95642 100644
--- a/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go
+++ b/iSolarCloud/AppService/getFormulaFaultAnalyseList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go b/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go
index 6e871bdcb..73847a0df 100644
--- a/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go
+++ b/iSolarCloud/AppService/getFormulaFaultAnalyseList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getGroupStringCheckResult/data.go b/iSolarCloud/AppService/getGroupStringCheckResult/data.go
index 210fb291e..9d19e88b6 100644
--- a/iSolarCloud/AppService/getGroupStringCheckResult/data.go
+++ b/iSolarCloud/AppService/getGroupStringCheckResult/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getGroupStringCheckResult/struct.go b/iSolarCloud/AppService/getGroupStringCheckResult/struct.go
index d4d6f3f63..816a10cfa 100644
--- a/iSolarCloud/AppService/getGroupStringCheckResult/struct.go
+++ b/iSolarCloud/AppService/getGroupStringCheckResult/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getGroupStringCheckRule/data.go b/iSolarCloud/AppService/getGroupStringCheckRule/data.go
index fd437b5b2..bdf426c6e 100644
--- a/iSolarCloud/AppService/getGroupStringCheckRule/data.go
+++ b/iSolarCloud/AppService/getGroupStringCheckRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getGroupStringCheckRule/struct.go b/iSolarCloud/AppService/getGroupStringCheckRule/struct.go
index b0c0a19be..d38e9f34e 100644
--- a/iSolarCloud/AppService/getGroupStringCheckRule/struct.go
+++ b/iSolarCloud/AppService/getGroupStringCheckRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHisData/data.go b/iSolarCloud/AppService/getHisData/data.go
index f2c869b6b..59f035dc5 100644
--- a/iSolarCloud/AppService/getHisData/data.go
+++ b/iSolarCloud/AppService/getHisData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHisData/struct.go b/iSolarCloud/AppService/getHisData/struct.go
index ca2dabf43..b727245df 100644
--- a/iSolarCloud/AppService/getHisData/struct.go
+++ b/iSolarCloud/AppService/getHisData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHistoryInfo/data.go b/iSolarCloud/AppService/getHistoryInfo/data.go
index eca433b44..b8d8befe0 100644
--- a/iSolarCloud/AppService/getHistoryInfo/data.go
+++ b/iSolarCloud/AppService/getHistoryInfo/data.go
@@ -59,7 +59,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHistoryInfo/struct.go b/iSolarCloud/AppService/getHistoryInfo/struct.go
index a56797ec1..1da69861a 100644
--- a/iSolarCloud/AppService/getHistoryInfo/struct.go
+++ b/iSolarCloud/AppService/getHistoryInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdEvaluation/data.go b/iSolarCloud/AppService/getHouseholdEvaluation/data.go
index c4718f925..dfd2ba016 100644
--- a/iSolarCloud/AppService/getHouseholdEvaluation/data.go
+++ b/iSolarCloud/AppService/getHouseholdEvaluation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdEvaluation/struct.go b/iSolarCloud/AppService/getHouseholdEvaluation/struct.go
index 35195d031..5b55853be 100644
--- a/iSolarCloud/AppService/getHouseholdEvaluation/struct.go
+++ b/iSolarCloud/AppService/getHouseholdEvaluation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go b/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go
index 42aed0a0a..0e649f945 100644
--- a/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go
+++ b/iSolarCloud/AppService/getHouseholdLeaveMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go b/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go
index b2db63723..8f8759fbc 100644
--- a/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go
+++ b/iSolarCloud/AppService/getHouseholdLeaveMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go b/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go
index e681acf9d..4aac06918 100644
--- a/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go
+++ b/iSolarCloud/AppService/getHouseholdOpinionFeedback/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go b/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go
index dbc2fc37b..6428119c2 100644
--- a/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go
+++ b/iSolarCloud/AppService/getHouseholdOpinionFeedback/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go
index 118c79132..f0c5b964e 100644
--- a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go
+++ b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go
index 9652393cc..9e532cc33 100644
--- a/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go
+++ b/iSolarCloud/AppService/getHouseholdPsInstallerByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
index 20affd0e1..f97127e90 100644
--- a/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
+++ b/iSolarCloud/AppService/getHouseholdStoragePsReport/data.go
@@ -86,7 +86,7 @@ type DayData struct {
TimeStamp valueTypes.DateTime `json:"time_stamp"`
Zfzy valueTypes.Float `json:"zfzy" PointName:"PV Power To Battery" PointUnitFrom:"ZfzyUnit" PointTimestampFrom:"TimeStamp"`
ZfzyUnit valueTypes.String `json:"zfzy_unit" PointIgnore:"true"`
- } `json:"point_data_15_list" PointNameFromChild:"TimeStamp" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"point_data_15_list" PointIdFromChild:"TimeStamp" PointArrayFlatten:"false" DataTable:"true"`
ZfzyMap valueTypes.UnitValue `json:"zfzy_map"`
ZfzyMapVirgin valueTypes.UnitValue `json:"zfzy_map_virgin" PointIgnore:"true"`
ZjzzMap valueTypes.UnitValue `json:"zjzz_map"`
@@ -152,7 +152,7 @@ type MonthData struct {
SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"`
SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"`
TimeStamp valueTypes.DateTime `json:"time_stamp"`
- } `json:"month_data_day_list" PointNameFromChild:"TimeStamp" PointNameDateFormat:"20060102" DataTable:"true"`
+ } `json:"month_data_day_list" PointIdFromChild:"TimeStamp" PointNameDateFormat:"20060102" DataTable:"true"`
}
type YearData struct {
@@ -214,7 +214,7 @@ type YearData struct {
SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"`
SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"`
TimeStamp valueTypes.DateTime `json:"time_stamp"`
- } `json:"year_data_month_list" PointNameFromChild:"TimeStamp" PointNameDateFormat:"200601" DataTable:"true"`
+ } `json:"year_data_month_list" PointIdFromChild:"TimeStamp" PointNameDateFormat:"200601" DataTable:"true"`
}
type TotalData struct {
@@ -274,7 +274,7 @@ type TotalData struct {
SelfConsumptionYield valueTypes.Float `json:"self_consumption_yield" PointUnitFrom:"SelfConsumptionYieldUnit" PointTimestampFrom:"TimeStamp"`
SelfConsumptionYieldUnit valueTypes.String `json:"self_consumption_yield_unit" PointIgnore:"true"`
TimeStamp valueTypes.DateTime `json:"time_stamp"`
- } `json:"total_data_year_list" PointNameFromChild:"TimeStamp" PointNameDateFormat:"20060102" DataTable:"true"`
+ } `json:"total_data_year_list" PointIdFromChild:"TimeStamp" PointNameDateFormat:"20060102" DataTable:"true"`
}
type DecodeResultData ResultData
diff --git a/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go b/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go
index ad5c60c25..ccb2adf85 100644
--- a/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go
+++ b/iSolarCloud/AppService/getHouseholdStoragePsReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
@@ -373,8 +373,8 @@ func (e EndPoint) GetEndPointResultTable() output.Table {
// SetFilenamePrefix - Produce filename based on area and endpoint name.
func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
- return e.ApiSetFilenamePrefix2(e.Request.RequestData, format, args...)
- // return e.ApiSetFilenamePrefix(format, args...)
+ // return e.ApiSetFilenamePrefix2(e.Request.RequestData, format, args...)
+ return e.ApiSetFilenamePrefix(format, args...)
}
// GetRequestArgNames -
diff --git a/iSolarCloud/AppService/getHouseholdUserInfo/data.go b/iSolarCloud/AppService/getHouseholdUserInfo/data.go
index d296a13a3..e2138c837 100644
--- a/iSolarCloud/AppService/getHouseholdUserInfo/data.go
+++ b/iSolarCloud/AppService/getHouseholdUserInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdUserInfo/struct.go b/iSolarCloud/AppService/getHouseholdUserInfo/struct.go
index 4af9700e8..0e6265260 100644
--- a/iSolarCloud/AppService/getHouseholdUserInfo/struct.go
+++ b/iSolarCloud/AppService/getHouseholdUserInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go
index 2323f1a05..b815f0c91 100644
--- a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go
+++ b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go
index c4e6e43d4..1c795986f 100644
--- a/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go
+++ b/iSolarCloud/AppService/getHouseholdWorkOrderInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go b/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go
index fb7a65d30..e6f8f0ab2 100644
--- a/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go
+++ b/iSolarCloud/AppService/getHouseholdWorkOrderList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go b/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go
index 006551658..2446baa82 100644
--- a/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go
+++ b/iSolarCloud/AppService/getHouseholdWorkOrderList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getI18nConfigByType/data.go b/iSolarCloud/AppService/getI18nConfigByType/data.go
index 67cb9ccc8..3447b31e2 100644
--- a/iSolarCloud/AppService/getI18nConfigByType/data.go
+++ b/iSolarCloud/AppService/getI18nConfigByType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getI18nConfigByType/struct.go b/iSolarCloud/AppService/getI18nConfigByType/struct.go
index d9c7cffbd..1785197a6 100644
--- a/iSolarCloud/AppService/getI18nConfigByType/struct.go
+++ b/iSolarCloud/AppService/getI18nConfigByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getI18nFileInfo/data.go b/iSolarCloud/AppService/getI18nFileInfo/data.go
index 757f2142f..fed058b17 100644
--- a/iSolarCloud/AppService/getI18nFileInfo/data.go
+++ b/iSolarCloud/AppService/getI18nFileInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getI18nFileInfo/struct.go b/iSolarCloud/AppService/getI18nFileInfo/struct.go
index 3f3c9776d..cb18c0877 100644
--- a/iSolarCloud/AppService/getI18nFileInfo/struct.go
+++ b/iSolarCloud/AppService/getI18nFileInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getI18nInfoByKey/data.go b/iSolarCloud/AppService/getI18nInfoByKey/data.go
index 9e859a1a2..8589804cc 100644
--- a/iSolarCloud/AppService/getI18nInfoByKey/data.go
+++ b/iSolarCloud/AppService/getI18nInfoByKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getI18nInfoByKey/struct.go b/iSolarCloud/AppService/getI18nInfoByKey/struct.go
index 9acce77f4..ce7d79557 100644
--- a/iSolarCloud/AppService/getI18nInfoByKey/struct.go
+++ b/iSolarCloud/AppService/getI18nInfoByKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getI18nVersion/data.go b/iSolarCloud/AppService/getI18nVersion/data.go
index 5bbcc4e95..e90e410dc 100644
--- a/iSolarCloud/AppService/getI18nVersion/data.go
+++ b/iSolarCloud/AppService/getI18nVersion/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getI18nVersion/struct.go b/iSolarCloud/AppService/getI18nVersion/struct.go
index 06d9bc564..fbb765b19 100644
--- a/iSolarCloud/AppService/getI18nVersion/struct.go
+++ b/iSolarCloud/AppService/getI18nVersion/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getIncomeSettingInfos/struct.go b/iSolarCloud/AppService/getIncomeSettingInfos/struct.go
index a11574fed..87e64aeac 100644
--- a/iSolarCloud/AppService/getIncomeSettingInfos/struct.go
+++ b/iSolarCloud/AppService/getIncomeSettingInfos/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInfoFromAMap/data.go b/iSolarCloud/AppService/getInfoFromAMap/data.go
index 3e21cc8ca..8798f17d5 100644
--- a/iSolarCloud/AppService/getInfoFromAMap/data.go
+++ b/iSolarCloud/AppService/getInfoFromAMap/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInfoFromAMap/struct.go b/iSolarCloud/AppService/getInfoFromAMap/struct.go
index 5aafd03e8..5ab304f52 100644
--- a/iSolarCloud/AppService/getInfoFromAMap/struct.go
+++ b/iSolarCloud/AppService/getInfoFromAMap/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInfomationFromRedis/data.go b/iSolarCloud/AppService/getInfomationFromRedis/data.go
index 46ddc3d8d..305dffeff 100644
--- a/iSolarCloud/AppService/getInfomationFromRedis/data.go
+++ b/iSolarCloud/AppService/getInfomationFromRedis/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInfomationFromRedis/struct.go b/iSolarCloud/AppService/getInfomationFromRedis/struct.go
index 5e3e24c86..929ea42b8 100644
--- a/iSolarCloud/AppService/getInfomationFromRedis/struct.go
+++ b/iSolarCloud/AppService/getInfomationFromRedis/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInstallInfoList/data.go b/iSolarCloud/AppService/getInstallInfoList/data.go
index 0444479ec..ada491bc1 100644
--- a/iSolarCloud/AppService/getInstallInfoList/data.go
+++ b/iSolarCloud/AppService/getInstallInfoList/data.go
@@ -67,7 +67,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInstallInfoList/struct.go b/iSolarCloud/AppService/getInstallInfoList/struct.go
index dfcf5d740..05dc868fa 100644
--- a/iSolarCloud/AppService/getInstallInfoList/struct.go
+++ b/iSolarCloud/AppService/getInstallInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go
index de778a38f..293ae7270 100644
--- a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go
+++ b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/data.go
@@ -76,7 +76,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go
index 8e455c478..7dd57dab8 100644
--- a/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go
+++ b/iSolarCloud/AppService/getInstallerInfoByDealerOrgCodeOrId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInvertDataList/data.go b/iSolarCloud/AppService/getInvertDataList/data.go
index 6a0757570..fc83d55cc 100644
--- a/iSolarCloud/AppService/getInvertDataList/data.go
+++ b/iSolarCloud/AppService/getInvertDataList/data.go
@@ -60,7 +60,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInvertDataList/struct.go b/iSolarCloud/AppService/getInvertDataList/struct.go
index b6fc3c58f..51246fed1 100644
--- a/iSolarCloud/AppService/getInvertDataList/struct.go
+++ b/iSolarCloud/AppService/getInvertDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInverterDataCount/data.go b/iSolarCloud/AppService/getInverterDataCount/data.go
index 8f4898e77..205c40651 100644
--- a/iSolarCloud/AppService/getInverterDataCount/data.go
+++ b/iSolarCloud/AppService/getInverterDataCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInverterDataCount/struct.go b/iSolarCloud/AppService/getInverterDataCount/struct.go
index c893f5899..8e4085a28 100644
--- a/iSolarCloud/AppService/getInverterDataCount/struct.go
+++ b/iSolarCloud/AppService/getInverterDataCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInverterProcess/data.go b/iSolarCloud/AppService/getInverterProcess/data.go
index f826ed96e..08f5d74ae 100644
--- a/iSolarCloud/AppService/getInverterProcess/data.go
+++ b/iSolarCloud/AppService/getInverterProcess/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInverterProcess/struct.go b/iSolarCloud/AppService/getInverterProcess/struct.go
index 127dedc32..66bc272e3 100644
--- a/iSolarCloud/AppService/getInverterProcess/struct.go
+++ b/iSolarCloud/AppService/getInverterProcess/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getInverterUuidBytotalId/data.go b/iSolarCloud/AppService/getInverterUuidBytotalId/data.go
index 9f6e5bd72..d63015f0c 100644
--- a/iSolarCloud/AppService/getInverterUuidBytotalId/data.go
+++ b/iSolarCloud/AppService/getInverterUuidBytotalId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go b/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go
index b38fc0855..6907f1744 100644
--- a/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go
+++ b/iSolarCloud/AppService/getInverterUuidBytotalId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getIvEchartsData/data.go b/iSolarCloud/AppService/getIvEchartsData/data.go
index 4ad738daa..034cc6aae 100644
--- a/iSolarCloud/AppService/getIvEchartsData/data.go
+++ b/iSolarCloud/AppService/getIvEchartsData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getIvEchartsData/struct.go b/iSolarCloud/AppService/getIvEchartsData/struct.go
index 2ad9048da..8e55065b7 100644
--- a/iSolarCloud/AppService/getIvEchartsData/struct.go
+++ b/iSolarCloud/AppService/getIvEchartsData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getIvEchartsDataById/data.go b/iSolarCloud/AppService/getIvEchartsDataById/data.go
index 5d0104d16..192700982 100644
--- a/iSolarCloud/AppService/getIvEchartsDataById/data.go
+++ b/iSolarCloud/AppService/getIvEchartsDataById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getIvEchartsDataById/struct.go b/iSolarCloud/AppService/getIvEchartsDataById/struct.go
index b9ab5eea9..f6ab370f4 100644
--- a/iSolarCloud/AppService/getIvEchartsDataById/struct.go
+++ b/iSolarCloud/AppService/getIvEchartsDataById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getKpiInfo/data.go b/iSolarCloud/AppService/getKpiInfo/data.go
index 2d28eee3b..a5d175bf2 100644
--- a/iSolarCloud/AppService/getKpiInfo/data.go
+++ b/iSolarCloud/AppService/getKpiInfo/data.go
@@ -58,7 +58,7 @@ func (e *EndPoint) GetData() api.DataMap {
for range Only.Once {
pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
_ = entries.CopyPoint(pkg + ".p83024", "virtual.system", "p83024", "")
}
diff --git a/iSolarCloud/AppService/getKpiInfo/struct.go b/iSolarCloud/AppService/getKpiInfo/struct.go
index d21a5503b..51570b764 100644
--- a/iSolarCloud/AppService/getKpiInfo/struct.go
+++ b/iSolarCloud/AppService/getKpiInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getListMiFromHBase/data.go b/iSolarCloud/AppService/getListMiFromHBase/data.go
index 92ae74c77..02bf9c70c 100644
--- a/iSolarCloud/AppService/getListMiFromHBase/data.go
+++ b/iSolarCloud/AppService/getListMiFromHBase/data.go
@@ -58,7 +58,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getListMiFromHBase/struct.go b/iSolarCloud/AppService/getListMiFromHBase/struct.go
index 676978ea6..6b2dd7978 100644
--- a/iSolarCloud/AppService/getListMiFromHBase/struct.go
+++ b/iSolarCloud/AppService/getListMiFromHBase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getMapInfo/data.go b/iSolarCloud/AppService/getMapInfo/data.go
index 95201983f..39b859475 100644
--- a/iSolarCloud/AppService/getMapInfo/data.go
+++ b/iSolarCloud/AppService/getMapInfo/data.go
@@ -60,7 +60,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getMapInfo/struct.go b/iSolarCloud/AppService/getMapInfo/struct.go
index 03556a6b5..a7a2f0d29 100644
--- a/iSolarCloud/AppService/getMapInfo/struct.go
+++ b/iSolarCloud/AppService/getMapInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getMapMiFromHBase/data.go b/iSolarCloud/AppService/getMapMiFromHBase/data.go
index e0d8477f6..c18682229 100644
--- a/iSolarCloud/AppService/getMapMiFromHBase/data.go
+++ b/iSolarCloud/AppService/getMapMiFromHBase/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getMapMiFromHBase/struct.go b/iSolarCloud/AppService/getMapMiFromHBase/struct.go
index fdf881c94..aa97113b2 100644
--- a/iSolarCloud/AppService/getMapMiFromHBase/struct.go
+++ b/iSolarCloud/AppService/getMapMiFromHBase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getMenuAndPrivileges/data.go b/iSolarCloud/AppService/getMenuAndPrivileges/data.go
index a6f2a89c1..589d7abb0 100644
--- a/iSolarCloud/AppService/getMenuAndPrivileges/data.go
+++ b/iSolarCloud/AppService/getMenuAndPrivileges/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getMenuAndPrivileges/struct.go b/iSolarCloud/AppService/getMenuAndPrivileges/struct.go
index 8a71c1845..7d6282200 100644
--- a/iSolarCloud/AppService/getMenuAndPrivileges/struct.go
+++ b/iSolarCloud/AppService/getMenuAndPrivileges/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go b/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go
index b718d586a..1b83e57a8 100644
--- a/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go
+++ b/iSolarCloud/AppService/getMicrogridEStoragePsReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go b/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go
index 7ed75ffcd..8a0afa5ff 100644
--- a/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go
+++ b/iSolarCloud/AppService/getMicrogridEStoragePsReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getModuleLogInfo/data.go b/iSolarCloud/AppService/getModuleLogInfo/data.go
index b0acf3591..a317de043 100644
--- a/iSolarCloud/AppService/getModuleLogInfo/data.go
+++ b/iSolarCloud/AppService/getModuleLogInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getModuleLogInfo/struct.go b/iSolarCloud/AppService/getModuleLogInfo/struct.go
index b306b2b0a..98309f5f8 100644
--- a/iSolarCloud/AppService/getModuleLogInfo/struct.go
+++ b/iSolarCloud/AppService/getModuleLogInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getModuleLogTaskList/data.go b/iSolarCloud/AppService/getModuleLogTaskList/data.go
index da7bf01e7..9d05b2338 100644
--- a/iSolarCloud/AppService/getModuleLogTaskList/data.go
+++ b/iSolarCloud/AppService/getModuleLogTaskList/data.go
@@ -50,7 +50,7 @@ type ResultData struct {
TaskId valueTypes.Integer `json:"task_id"`
TaskName valueTypes.Integer `json:"task_name"`
UpdateTime valueTypes.DateTime `json:"update_time"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"TaskId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"TaskId" PointIdReplace:"true" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
Size valueTypes.Integer `json:"size"`
StartIndex valueTypes.Integer `json:"startIndex" PointId:"start_index"`
@@ -91,7 +91,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getModuleLogTaskList/struct.go b/iSolarCloud/AppService/getModuleLogTaskList/struct.go
index 3d3ad0e96..df9e4b6de 100644
--- a/iSolarCloud/AppService/getModuleLogTaskList/struct.go
+++ b/iSolarCloud/AppService/getModuleLogTaskList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getNationProvJSON/data.go b/iSolarCloud/AppService/getNationProvJSON/data.go
index 7e21fa363..1e8f632de 100644
--- a/iSolarCloud/AppService/getNationProvJSON/data.go
+++ b/iSolarCloud/AppService/getNationProvJSON/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getNationProvJSON/struct.go b/iSolarCloud/AppService/getNationProvJSON/struct.go
index 26de9a4a5..a7ab36bf3 100644
--- a/iSolarCloud/AppService/getNationProvJSON/struct.go
+++ b/iSolarCloud/AppService/getNationProvJSON/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go
index 31786fad5..1ab88243d 100644
--- a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go
+++ b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go
index 3bca3268c..95712bb05 100644
--- a/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go
+++ b/iSolarCloud/AppService/getNeedOpAsynOpRecordList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getNoticeInfo/data.go b/iSolarCloud/AppService/getNoticeInfo/data.go
index 46d1a0747..7fb14b49c 100644
--- a/iSolarCloud/AppService/getNoticeInfo/data.go
+++ b/iSolarCloud/AppService/getNoticeInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getNoticeInfo/struct.go b/iSolarCloud/AppService/getNoticeInfo/struct.go
index b466656de..650c54c48 100644
--- a/iSolarCloud/AppService/getNoticeInfo/struct.go
+++ b/iSolarCloud/AppService/getNoticeInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getNumberOfServiceCalls/data.go b/iSolarCloud/AppService/getNumberOfServiceCalls/data.go
index bed6efc7f..f98e5e83e 100644
--- a/iSolarCloud/AppService/getNumberOfServiceCalls/data.go
+++ b/iSolarCloud/AppService/getNumberOfServiceCalls/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go b/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go
index 581c3cf6c..83adb1470 100644
--- a/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go
+++ b/iSolarCloud/AppService/getNumberOfServiceCalls/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOSSConfig/data.go b/iSolarCloud/AppService/getOSSConfig/data.go
index ede28a7bf..78fa87999 100644
--- a/iSolarCloud/AppService/getOSSConfig/data.go
+++ b/iSolarCloud/AppService/getOSSConfig/data.go
@@ -71,7 +71,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOSSConfig/struct.go b/iSolarCloud/AppService/getOSSConfig/struct.go
index d1b6c414e..cb5e4604d 100644
--- a/iSolarCloud/AppService/getOSSConfig/struct.go
+++ b/iSolarCloud/AppService/getOSSConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOperRuleDetail/data.go b/iSolarCloud/AppService/getOperRuleDetail/data.go
index f2ddca1d2..25f4832d9 100644
--- a/iSolarCloud/AppService/getOperRuleDetail/data.go
+++ b/iSolarCloud/AppService/getOperRuleDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOperRuleDetail/struct.go b/iSolarCloud/AppService/getOperRuleDetail/struct.go
index 9b26fd1fa..ecec2f4d1 100644
--- a/iSolarCloud/AppService/getOperRuleDetail/struct.go
+++ b/iSolarCloud/AppService/getOperRuleDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOperateBillFileId/data.go b/iSolarCloud/AppService/getOperateBillFileId/data.go
index 3fe322c87..f2b9cd4e9 100644
--- a/iSolarCloud/AppService/getOperateBillFileId/data.go
+++ b/iSolarCloud/AppService/getOperateBillFileId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOperateBillFileId/struct.go b/iSolarCloud/AppService/getOperateBillFileId/struct.go
index 8599691d6..bf13bec49 100644
--- a/iSolarCloud/AppService/getOperateBillFileId/struct.go
+++ b/iSolarCloud/AppService/getOperateBillFileId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOperateTicketForDetail/data.go b/iSolarCloud/AppService/getOperateTicketForDetail/data.go
index 5ed0d4aa5..6cc5e2de1 100644
--- a/iSolarCloud/AppService/getOperateTicketForDetail/data.go
+++ b/iSolarCloud/AppService/getOperateTicketForDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOperateTicketForDetail/struct.go b/iSolarCloud/AppService/getOperateTicketForDetail/struct.go
index aa4a2c2f4..de95856b8 100644
--- a/iSolarCloud/AppService/getOperateTicketForDetail/struct.go
+++ b/iSolarCloud/AppService/getOperateTicketForDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go
index 910aad55c..ab6967f2f 100644
--- a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go
+++ b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go
index 9018d6f89..bd4cca80b 100644
--- a/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go
+++ b/iSolarCloud/AppService/getOrCreateNetEaseUserToken/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrderDataList/data.go b/iSolarCloud/AppService/getOrderDataList/data.go
index 1959e73c5..afd489fbd 100644
--- a/iSolarCloud/AppService/getOrderDataList/data.go
+++ b/iSolarCloud/AppService/getOrderDataList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrderDataList/struct.go b/iSolarCloud/AppService/getOrderDataList/struct.go
index 43d2738a5..c05ceda67 100644
--- a/iSolarCloud/AppService/getOrderDataList/struct.go
+++ b/iSolarCloud/AppService/getOrderDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrderDataSql2/data.go b/iSolarCloud/AppService/getOrderDataSql2/data.go
index b80366075..d87074e37 100644
--- a/iSolarCloud/AppService/getOrderDataSql2/data.go
+++ b/iSolarCloud/AppService/getOrderDataSql2/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrderDataSql2/struct.go b/iSolarCloud/AppService/getOrderDataSql2/struct.go
index e0ece55ea..2b641c6ef 100644
--- a/iSolarCloud/AppService/getOrderDataSql2/struct.go
+++ b/iSolarCloud/AppService/getOrderDataSql2/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrderDatas/data.go b/iSolarCloud/AppService/getOrderDatas/data.go
index 9e75d2784..e4607625a 100644
--- a/iSolarCloud/AppService/getOrderDatas/data.go
+++ b/iSolarCloud/AppService/getOrderDatas/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrderDatas/struct.go b/iSolarCloud/AppService/getOrderDatas/struct.go
index 6773c3517..37dd76376 100644
--- a/iSolarCloud/AppService/getOrderDatas/struct.go
+++ b/iSolarCloud/AppService/getOrderDatas/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrderDetail/data.go b/iSolarCloud/AppService/getOrderDetail/data.go
index 210923f36..58f392a03 100644
--- a/iSolarCloud/AppService/getOrderDetail/data.go
+++ b/iSolarCloud/AppService/getOrderDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrderDetail/struct.go b/iSolarCloud/AppService/getOrderDetail/struct.go
index 19c3f02bd..389074569 100644
--- a/iSolarCloud/AppService/getOrderDetail/struct.go
+++ b/iSolarCloud/AppService/getOrderDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrderStatistics/data.go b/iSolarCloud/AppService/getOrderStatistics/data.go
index 7e204517c..fa370a6b6 100644
--- a/iSolarCloud/AppService/getOrderStatistics/data.go
+++ b/iSolarCloud/AppService/getOrderStatistics/data.go
@@ -65,7 +65,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrderStatistics/struct.go b/iSolarCloud/AppService/getOrderStatistics/struct.go
index 566e97e26..a8bbf0a1c 100644
--- a/iSolarCloud/AppService/getOrderStatistics/struct.go
+++ b/iSolarCloud/AppService/getOrderStatistics/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrgIdNameByUserId/data.go b/iSolarCloud/AppService/getOrgIdNameByUserId/data.go
index a3c5291cd..f5d20a909 100644
--- a/iSolarCloud/AppService/getOrgIdNameByUserId/data.go
+++ b/iSolarCloud/AppService/getOrgIdNameByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go b/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go
index e79ccbdf1..ef1c3dce3 100644
--- a/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go
+++ b/iSolarCloud/AppService/getOrgIdNameByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go
index 7ce722cb5..33b048b96 100644
--- a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go
+++ b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go
index 6c103fdd9..080136d6d 100644
--- a/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go
+++ b/iSolarCloud/AppService/getOrgInfoByDealerOrgCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrgListByName/data.go b/iSolarCloud/AppService/getOrgListByName/data.go
index 76dc93235..284d8870e 100644
--- a/iSolarCloud/AppService/getOrgListByName/data.go
+++ b/iSolarCloud/AppService/getOrgListByName/data.go
@@ -64,7 +64,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrgListByName/struct.go b/iSolarCloud/AppService/getOrgListByName/struct.go
index 5d0906d6a..1aea99375 100644
--- a/iSolarCloud/AppService/getOrgListByName/struct.go
+++ b/iSolarCloud/AppService/getOrgListByName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrgListByUserId/data.go b/iSolarCloud/AppService/getOrgListByUserId/data.go
index ccc22ae53..7a8308335 100644
--- a/iSolarCloud/AppService/getOrgListByUserId/data.go
+++ b/iSolarCloud/AppService/getOrgListByUserId/data.go
@@ -64,7 +64,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrgListByUserId/struct.go b/iSolarCloud/AppService/getOrgListByUserId/struct.go
index f20e8319d..d7d9bf825 100644
--- a/iSolarCloud/AppService/getOrgListByUserId/struct.go
+++ b/iSolarCloud/AppService/getOrgListByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOrgListForUser/data.go b/iSolarCloud/AppService/getOrgListForUser/data.go
index 2504b130d..db17f3eda 100644
--- a/iSolarCloud/AppService/getOrgListForUser/data.go
+++ b/iSolarCloud/AppService/getOrgListForUser/data.go
@@ -75,7 +75,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOrgListForUser/struct.go b/iSolarCloud/AppService/getOrgListForUser/struct.go
index 81da471db..98b813e9c 100644
--- a/iSolarCloud/AppService/getOrgListForUser/struct.go
+++ b/iSolarCloud/AppService/getOrgListForUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOssObjectStream/data.go b/iSolarCloud/AppService/getOssObjectStream/data.go
index 48334c224..722edc103 100644
--- a/iSolarCloud/AppService/getOssObjectStream/data.go
+++ b/iSolarCloud/AppService/getOssObjectStream/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOssObjectStream/struct.go b/iSolarCloud/AppService/getOssObjectStream/struct.go
index 06986defc..ab61110c4 100644
--- a/iSolarCloud/AppService/getOssObjectStream/struct.go
+++ b/iSolarCloud/AppService/getOssObjectStream/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getOwnerFaultConfigList/data.go b/iSolarCloud/AppService/getOwnerFaultConfigList/data.go
index ee3e279f6..bb0919a81 100644
--- a/iSolarCloud/AppService/getOwnerFaultConfigList/data.go
+++ b/iSolarCloud/AppService/getOwnerFaultConfigList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go b/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go
index 1cb78b97a..8f2acb606 100644
--- a/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go
+++ b/iSolarCloud/AppService/getOwnerFaultConfigList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPListinfoFromMysql/data.go b/iSolarCloud/AppService/getPListinfoFromMysql/data.go
index 5f3c68e63..3b17a046f 100644
--- a/iSolarCloud/AppService/getPListinfoFromMysql/data.go
+++ b/iSolarCloud/AppService/getPListinfoFromMysql/data.go
@@ -54,7 +54,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPListinfoFromMysql/struct.go b/iSolarCloud/AppService/getPListinfoFromMysql/struct.go
index b4179f046..99ddb87ff 100644
--- a/iSolarCloud/AppService/getPListinfoFromMysql/struct.go
+++ b/iSolarCloud/AppService/getPListinfoFromMysql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go
index 390fa50a3..a58d6cf9f 100644
--- a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go
+++ b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go
index ba18f50d2..ecd1e85a6 100644
--- a/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go
+++ b/iSolarCloud/AppService/getParamSetTemplate4NewProtocol/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go b/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go
index 32e58b663..e88634ea9 100644
--- a/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go
+++ b/iSolarCloud/AppService/getParamSetTemplatePointInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go b/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go
index 932245e40..b15f781ee 100644
--- a/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go
+++ b/iSolarCloud/AppService/getParamSetTemplatePointInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getParamterSettingBase/data.go b/iSolarCloud/AppService/getParamterSettingBase/data.go
index ab8bda163..6de6ac4d2 100644
--- a/iSolarCloud/AppService/getParamterSettingBase/data.go
+++ b/iSolarCloud/AppService/getParamterSettingBase/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getParamterSettingBase/struct.go b/iSolarCloud/AppService/getParamterSettingBase/struct.go
index af47b46dd..9f540ce3b 100644
--- a/iSolarCloud/AppService/getParamterSettingBase/struct.go
+++ b/iSolarCloud/AppService/getParamterSettingBase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPhotoInfo/data.go b/iSolarCloud/AppService/getPhotoInfo/data.go
index 820405fdd..d5c7310ca 100644
--- a/iSolarCloud/AppService/getPhotoInfo/data.go
+++ b/iSolarCloud/AppService/getPhotoInfo/data.go
@@ -62,7 +62,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPhotoInfo/struct.go b/iSolarCloud/AppService/getPhotoInfo/struct.go
index edf7c087e..e5a5fc9dd 100644
--- a/iSolarCloud/AppService/getPhotoInfo/struct.go
+++ b/iSolarCloud/AppService/getPhotoInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPlanedOrNotPsList/data.go b/iSolarCloud/AppService/getPlanedOrNotPsList/data.go
index 77032b293..f85f6784f 100644
--- a/iSolarCloud/AppService/getPlanedOrNotPsList/data.go
+++ b/iSolarCloud/AppService/getPlanedOrNotPsList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go b/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go
index 2b60e3283..b79939c15 100644
--- a/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go
+++ b/iSolarCloud/AppService/getPlanedOrNotPsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPlantReportPDFList/data.go b/iSolarCloud/AppService/getPlantReportPDFList/data.go
index 373a4192b..b27681fd4 100644
--- a/iSolarCloud/AppService/getPlantReportPDFList/data.go
+++ b/iSolarCloud/AppService/getPlantReportPDFList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPlantReportPDFList/struct.go b/iSolarCloud/AppService/getPlantReportPDFList/struct.go
index daa626827..14b17fdf5 100644
--- a/iSolarCloud/AppService/getPlantReportPDFList/struct.go
+++ b/iSolarCloud/AppService/getPlantReportPDFList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go b/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go
index 88833ab9a..67c30426d 100644
--- a/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go
+++ b/iSolarCloud/AppService/getPowerChargeSettingInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go b/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go
index ba351cabe..826256ced 100644
--- a/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go
+++ b/iSolarCloud/AppService/getPowerDeviceModelTechList/data.go
@@ -102,7 +102,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go b/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go
index 0bad1ed8d..c41cf82dc 100644
--- a/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go
+++ b/iSolarCloud/AppService/getPowerDeviceModelTechList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDeviceModelTree/data.go b/iSolarCloud/AppService/getPowerDeviceModelTree/data.go
index c2c00dff2..6ffcd1f4f 100644
--- a/iSolarCloud/AppService/getPowerDeviceModelTree/data.go
+++ b/iSolarCloud/AppService/getPowerDeviceModelTree/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go b/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go
index 717be5818..0a03e4a50 100644
--- a/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go
+++ b/iSolarCloud/AppService/getPowerDeviceModelTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDevicePointInfo/data.go b/iSolarCloud/AppService/getPowerDevicePointInfo/data.go
index a542bc3cf..c24450ffc 100644
--- a/iSolarCloud/AppService/getPowerDevicePointInfo/data.go
+++ b/iSolarCloud/AppService/getPowerDevicePointInfo/data.go
@@ -129,7 +129,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go b/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go
index 55192c88e..87513e73f 100644
--- a/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go
+++ b/iSolarCloud/AppService/getPowerDevicePointInfo/struct.go
@@ -37,7 +37,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDevicePointNames/data.go b/iSolarCloud/AppService/getPowerDevicePointNames/data.go
index 904d819d7..af11697da 100644
--- a/iSolarCloud/AppService/getPowerDevicePointNames/data.go
+++ b/iSolarCloud/AppService/getPowerDevicePointNames/data.go
@@ -165,7 +165,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDevicePointNames/struct.go b/iSolarCloud/AppService/getPowerDevicePointNames/struct.go
index fc38bdce5..48c3a0749 100644
--- a/iSolarCloud/AppService/getPowerDevicePointNames/struct.go
+++ b/iSolarCloud/AppService/getPowerDevicePointNames/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go
index 4460df0e0..123be1227 100644
--- a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go
+++ b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/data.go
@@ -28,7 +28,7 @@ func (rd RequestData) Help() string {
type ResultData struct {
DeviceList []interface{} `json:"device_list"`
- PageList []interface{} `json:"pageList" PointId:"page_list" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true" PointArrayFlatten:"false"`
PsNameInfoList []interface{} `json:"ps_name_info_list"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -67,7 +67,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go
index 1923bd917..a8f6ab75a 100644
--- a/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go
+++ b/iSolarCloud/AppService/getPowerDeviceSetTaskDetailList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
index 2a3464f71..2f36085f8 100644
--- a/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
+++ b/iSolarCloud/AppService/getPowerDeviceSetTaskList/data.go
@@ -27,6 +27,8 @@ func (rd RequestData) Help() string {
type ResultData struct {
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"GoStruct" PointDeviceFrom:"PsId"`
+
CommandStatus valueTypes.Integer `json:"command_status"`
CommandType valueTypes.Integer `json:"command_type"`
CreateTime valueTypes.DateTime `json:"create_time"`
@@ -48,7 +50,7 @@ type ResultData struct {
UserEnglishName interface{} `json:"user_english_name"`
UserName valueTypes.String `json:"user_name"`
UUID valueTypes.Integer `json:"uuid"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsId.CreateTime" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsId.CreateTime" PointIdReplace:"true" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -70,7 +72,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go b/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go
index cef2ffc0a..139cfad15 100644
--- a/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go
+++ b/iSolarCloud/AppService/getPowerDeviceSetTaskList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go
index d3c240346..485c792d3 100644
--- a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go
+++ b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go
index 6751c9e60..1c5a6b0a5 100644
--- a/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go
+++ b/iSolarCloud/AppService/getPowerFormulaFaultAnalyse/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerPictureList/data.go b/iSolarCloud/AppService/getPowerPictureList/data.go
index a54fb6079..01c2d27eb 100644
--- a/iSolarCloud/AppService/getPowerPictureList/data.go
+++ b/iSolarCloud/AppService/getPowerPictureList/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerPictureList/struct.go b/iSolarCloud/AppService/getPowerPictureList/struct.go
index 51f3ff58c..2d227859f 100644
--- a/iSolarCloud/AppService/getPowerPictureList/struct.go
+++ b/iSolarCloud/AppService/getPowerPictureList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go
index 97c3ac2a8..0aeb36568 100644
--- a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go
+++ b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go
index 1a110df1e..1b7c5279c 100644
--- a/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go
+++ b/iSolarCloud/AppService/getPowerRobotInfoByRobotSn/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go
index a5fcfa528..06973a6d8 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go
index a5e3475cc..135c492ac 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepAttrByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go
index 972a7a455..f155e0119 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepStrategy/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go
index 670361833..80c996c71 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepStrategy/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go
index e442a64c9..9edb6a890 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go
index da6e97d3c..a6aa0f8a3 100644
--- a/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go
+++ b/iSolarCloud/AppService/getPowerRobotSweepStrategyList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerSettingCharges/data.go b/iSolarCloud/AppService/getPowerSettingCharges/data.go
index 60c08ccb0..afc835f30 100644
--- a/iSolarCloud/AppService/getPowerSettingCharges/data.go
+++ b/iSolarCloud/AppService/getPowerSettingCharges/data.go
@@ -67,7 +67,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerSettingCharges/struct.go b/iSolarCloud/AppService/getPowerSettingCharges/struct.go
index 7f8268c71..77b6bf1da 100644
--- a/iSolarCloud/AppService/getPowerSettingCharges/struct.go
+++ b/iSolarCloud/AppService/getPowerSettingCharges/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go b/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go
index 2c6b03a30..b1f751ff5 100644
--- a/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go
+++ b/iSolarCloud/AppService/getPowerSettingHistoryRecords/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go b/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go
index 640c99b11..ebb27351b 100644
--- a/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go
+++ b/iSolarCloud/AppService/getPowerSettingHistoryRecords/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go b/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go
index a67e28105..6856ecd25 100644
--- a/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go
+++ b/iSolarCloud/AppService/getPowerStationBasicInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationData/struct.go b/iSolarCloud/AppService/getPowerStationData/struct.go
index cf8c1c205..d146a2bc9 100644
--- a/iSolarCloud/AppService/getPowerStationData/struct.go
+++ b/iSolarCloud/AppService/getPowerStationData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationForHousehold/struct.go b/iSolarCloud/AppService/getPowerStationForHousehold/struct.go
index dba8694b1..b48d5b512 100644
--- a/iSolarCloud/AppService/getPowerStationForHousehold/struct.go
+++ b/iSolarCloud/AppService/getPowerStationForHousehold/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationInfo/data.go b/iSolarCloud/AppService/getPowerStationInfo/data.go
index 1ebe0cd38..74f0ae638 100644
--- a/iSolarCloud/AppService/getPowerStationInfo/data.go
+++ b/iSolarCloud/AppService/getPowerStationInfo/data.go
@@ -1,6 +1,7 @@
package getPowerStationInfo
import (
+ "GoSungrow/iSolarCloud/Common"
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
@@ -25,99 +26,105 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- ParamIncome valueTypes.Float `json:"param_income"`
- RemindType interface{} `json:"remindType" PointId:"remind_type"`
+ ParamIncome valueTypes.Float `json:"param_income"`
+ RemindType Common.Unknown `json:"remindType" PointId:"remind_type"`
- PowerStationMap struct {
- AreaId interface{} `json:"area_id"`
+ PowerStationMap struct {
+ AreaId Common.Unknown `json:"area_id"`
ConnectType valueTypes.Integer `json:"connect_type"`
- County interface{} `json:"county"`
- CountyCode interface{} `json:"county_code"`
+ County Common.Unknown `json:"county"`
+ CountyCode Common.Unknown `json:"county_code"`
DesignCapacity2 valueTypes.Float `json:"designCapacity" PointIgnore:"true"`
DesignCapacity valueTypes.Float `json:"design_capacity" PointUnit:"W"`
Email valueTypes.String `json:"email"`
- EnergyScheme interface{} `json:"energy_scheme"`
+ EnergyScheme Common.Unknown `json:"energy_scheme"`
ExpectInstallDate valueTypes.DateTime `json:"expect_install_date"`
- FaultSendType interface{} `json:"fault_send_type"`
+ FaultSendType Common.Unknown `json:"fault_send_type"`
GcjLatitude valueTypes.Float `json:"gcj_latitude"`
GcjLongitude valueTypes.Float `json:"gcj_longitude"`
Latitude valueTypes.Float `json:"latitude"`
Longitude valueTypes.Float `json:"longitude"`
- Name interface{} `json:"name"`
- NameCode interface{} `json:"name_code"`
- Nation interface{} `json:"nation"`
- NationCode interface{} `json:"nation_code"`
+ Name Common.Unknown `json:"name"`
+ NameCode Common.Unknown `json:"name_code"`
+ Nation Common.Unknown `json:"nation"`
+ NationCode Common.Unknown `json:"nation_code"`
ParamIncome valueTypes.Float `json:"param_income"`
- Prov interface{} `json:"prov"`
- ProvCode interface{} `json:"prov_code"`
+ Prov Common.Unknown `json:"prov"`
+ ProvCode Common.Unknown `json:"prov_code"`
PsBuildDate valueTypes.DateTime `json:"ps_build_date"`
PsCountryId valueTypes.Integer `json:"ps_country_id"`
- PsDesc interface{} `json:"ps_desc"`
+ PsDesc Common.Unknown `json:"ps_desc"`
PsHolder valueTypes.String `json:"ps_holder"`
- PsId valueTypes.PsId `json:"ps_id"`
+ PsId valueTypes.PsId `json:"ps_id"`
PsLocation valueTypes.String `json:"ps_location"`
PsName valueTypes.String `json:"ps_name"`
PsType valueTypes.Integer `json:"ps_type"`
RecordCreateTime valueTypes.DateTime `json:"recore_create_time" PointId:"record_create_time"`
- ReportType interface{} `json:"report_type"`
+ ReportType Common.Unknown `json:"report_type"`
ShippingAddress valueTypes.String `json:"shipping_address"`
ShippingZipCode valueTypes.String `json:"shipping_zip_code"`
TimeZoneId valueTypes.Integer `json:"time_zone_id"`
- ValidFlag valueTypes.Integer `json:"valid_flag"`
- Village interface{} `json:"village"`
- VillageCode interface{} `json:"village_code"`
+ ValidFlag valueTypes.Bool `json:"valid_flag"`
+ Village Common.Unknown `json:"village"`
+ VillageCode Common.Unknown `json:"village_code"`
WgsLatitude valueTypes.Float `json:"wgs_latitude"`
WgsLongitude valueTypes.Float `json:"wgs_longitude"`
ZipCode valueTypes.String `json:"zip_code"`
- } `json:"powerStationMap" PointId:"power_station_map"`
+ } `json:"powerStationMap" PointId:"power_station_map" PointIdFromChild:"PsId" PointIdReplace:"true"`
InstallProviderInfo struct {
Installer valueTypes.String `json:"installer"`
InstallerEmail valueTypes.String `json:"installer_email"`
InstallerPhone valueTypes.String `json:"installer_phone"`
- OrgURL interface{} `json:"org_url"`
+ OrgURL Common.Unknown `json:"org_url"`
UpOrgId valueTypes.Integer `json:"up_org_id"`
} `json:"installProviderInfo" PointId:"install_provider_info"`
+
PowerChargeDataMap struct {
CodeType valueTypes.Integer `json:"code_type"`
DefaultCharge valueTypes.Float `json:"default_charge"`
ElectricChargeId valueTypes.Integer `json:"electric_charge_id"`
EndTime valueTypes.DateTime `json:"end_time"`
- IntervalTimeCharge interface{} `json:"interval_time_charge"`
+ IntervalTimeCharge Common.Unknown `json:"interval_time_charge"`
ParamIncomeUnitName valueTypes.String `json:"param_income_unit_name"`
StartTime valueTypes.DateTime `json:"start_time"`
} `json:"powerChargeDataMap" PointId:"power_charge_data_map"`
+
SysTimeZones []struct {
Id valueTypes.Integer `json:"id"`
TimezoneName valueTypes.String `json:"timezone_name"`
TimezoneUtc valueTypes.String `json:"timezone_utc"`
} `json:"sysTimeZones" PointId:"sys_time_zones" PointArrayFlatten:"false" DataTable:"true"`
- PowerPictureList []interface{} `json:"powerPictureList" PointId:"power_picture_list" PointArrayFlatten:"false"`
+ PowerPictureList []struct {
+ PicID valueTypes.Integer `json:"pic_id"`
+ PicLanguage valueTypes.Integer `json:"pic_language"`
+ PicType valueTypes.Integer `json:"pic_type"`
+ PictureName valueTypes.String `json:"picture_name"`
+ PictureURL valueTypes.String `json:"picture_url"`
+ PsUnitUUID interface{} `json:"ps_unit_uuid"`
+ } `json:"powerPictureList" PointId:"power_picture_list" PointArrayFlatten:"false"`
+
SendReportConfigList []valueTypes.String `json:"sendReportConfigList" PointId:"send_report_config_list"`
CurrencyTypeList []struct {
CodeName valueTypes.String `json:"code_name"`
CodeValue valueTypes.Integer `json:"code_value"`
- } `json:"currencyTypeList" PointId:"currency_type_list" PointArrayFlatten:"false" DataTable:"true"` // PointNameFromChild:"CodeValue"`
+ } `json:"currencyTypeList" PointId:"currency_type_list" PointArrayFlatten:"false" DataTable:"true"`
+
ParallelTypes []struct {
CodeName valueTypes.String `json:"code_name"`
CodeValue valueTypes.Integer `json:"code_value"`
} `json:"parallelTypes" PointId:"parallel_types" PointArrayFlatten:"false" DataTable:"true"`
+
StatusList []struct {
CodeName valueTypes.String `json:"code_name"`
CodeValue valueTypes.Integer `json:"code_value"`
- } `json:"statusList" PointId:"status_list" PointArrayFlatten:"false" DataTable:"true"` // PointArrayFlatten:"true"`
+ } `json:"statusList" PointId:"status_list" PointArrayFlatten:"false" DataTable:"true"`
}
func (e *ResultData) IsValid() error {
var err error
- // switch {
- // case e.Dummy == "":
- // break
- // default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- // }
return err
}
@@ -125,9 +132,6 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.PsId.String()
entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
}
diff --git a/iSolarCloud/AppService/getPowerStationInfo/struct.go b/iSolarCloud/AppService/getPowerStationInfo/struct.go
index a5ebb9e99..974d8bfc9 100644
--- a/iSolarCloud/AppService/getPowerStationInfo/struct.go
+++ b/iSolarCloud/AppService/getPowerStationInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationPR/data.go b/iSolarCloud/AppService/getPowerStationPR/data.go
index 2f7abbac6..0691541d0 100644
--- a/iSolarCloud/AppService/getPowerStationPR/data.go
+++ b/iSolarCloud/AppService/getPowerStationPR/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerStationPR/struct.go b/iSolarCloud/AppService/getPowerStationPR/struct.go
index 4d34a7a35..6eb4a6e2f 100644
--- a/iSolarCloud/AppService/getPowerStationPR/struct.go
+++ b/iSolarCloud/AppService/getPowerStationPR/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationTableDataSql/data.go b/iSolarCloud/AppService/getPowerStationTableDataSql/data.go
index 3aa9a2bb8..f62e0d073 100644
--- a/iSolarCloud/AppService/getPowerStationTableDataSql/data.go
+++ b/iSolarCloud/AppService/getPowerStationTableDataSql/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go b/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go
index 11ec065ee..e808a72f2 100644
--- a/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go
+++ b/iSolarCloud/AppService/getPowerStationTableDataSql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go
index 7c5d7405b..0d8e3d032 100644
--- a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go
+++ b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go
index 5496f4a84..9e5a7ee10 100644
--- a/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go
+++ b/iSolarCloud/AppService/getPowerStationTableDataSqlCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerStatistics/struct.go b/iSolarCloud/AppService/getPowerStatistics/struct.go
index 7d5085451..fd6ae6ad1 100644
--- a/iSolarCloud/AppService/getPowerStatistics/struct.go
+++ b/iSolarCloud/AppService/getPowerStatistics/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPowerTrendDayData/data.go b/iSolarCloud/AppService/getPowerTrendDayData/data.go
index 8faaf5974..5b026787c 100644
--- a/iSolarCloud/AppService/getPowerTrendDayData/data.go
+++ b/iSolarCloud/AppService/getPowerTrendDayData/data.go
@@ -58,7 +58,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPowerTrendDayData/struct.go b/iSolarCloud/AppService/getPowerTrendDayData/struct.go
index 59d499ae7..bd6f32cc2 100644
--- a/iSolarCloud/AppService/getPowerTrendDayData/struct.go
+++ b/iSolarCloud/AppService/getPowerTrendDayData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go
index e1765afa4..cb6c86341 100644
--- a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go
+++ b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go
index b53c3728f..abf7dce20 100644
--- a/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go
+++ b/iSolarCloud/AppService/getPrivateCloudValidityPeriod/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getProvInfoListByNationCode/data.go b/iSolarCloud/AppService/getProvInfoListByNationCode/data.go
index 09244ffc7..98b74923d 100644
--- a/iSolarCloud/AppService/getProvInfoListByNationCode/data.go
+++ b/iSolarCloud/AppService/getProvInfoListByNationCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go b/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go
index 3c01ef664..d1f6589f5 100644
--- a/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go
+++ b/iSolarCloud/AppService/getProvInfoListByNationCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsAuthKey/data.go b/iSolarCloud/AppService/getPsAuthKey/data.go
index aa9b51e33..63dbe100d 100644
--- a/iSolarCloud/AppService/getPsAuthKey/data.go
+++ b/iSolarCloud/AppService/getPsAuthKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsAuthKey/struct.go b/iSolarCloud/AppService/getPsAuthKey/struct.go
index 925698bd0..d0c728306 100644
--- a/iSolarCloud/AppService/getPsAuthKey/struct.go
+++ b/iSolarCloud/AppService/getPsAuthKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsCurveInfo/data.go b/iSolarCloud/AppService/getPsCurveInfo/data.go
index 58a6d6517..9d72b2914 100644
--- a/iSolarCloud/AppService/getPsCurveInfo/data.go
+++ b/iSolarCloud/AppService/getPsCurveInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsCurveInfo/struct.go b/iSolarCloud/AppService/getPsCurveInfo/struct.go
index ba0d43a36..e5cedb448 100644
--- a/iSolarCloud/AppService/getPsCurveInfo/struct.go
+++ b/iSolarCloud/AppService/getPsCurveInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go b/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go
index 233edb6c0..ed6a3d11a 100644
--- a/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go
+++ b/iSolarCloud/AppService/getPsDataSupplementTaskList/data.go
@@ -24,7 +24,7 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- PageList interface{} `json:"pageList" PointId:"page_list" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PageList interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true" PointArrayFlatten:"false"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -62,7 +62,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go b/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go
index e7f44a20c..076358d2e 100644
--- a/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go
+++ b/iSolarCloud/AppService/getPsDataSupplementTaskList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsDetail/data.go b/iSolarCloud/AppService/getPsDetail/data.go
index 961997611..09ad49ede 100644
--- a/iSolarCloud/AppService/getPsDetail/data.go
+++ b/iSolarCloud/AppService/getPsDetail/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- Images Common.PowerStationImages `json:"images" PointArrayFlatten:"false"`
+ Images Common.PowerStationImages `json:"images"`
RobotNumSweepCapacity struct {
Num valueTypes.Integer `json:"num"`
SweepCapacity valueTypes.Float `json:"sweep_capacity"`
@@ -42,36 +42,38 @@ type ResultData struct {
DeviceType valueTypes.Integer `json:"device_type"`
DrmStatus valueTypes.Integer `json:"drm_status"`
DrmStatusName valueTypes.String `json:"drm_status_name"`
- EnergyFlow []valueTypes.Integer `json:"energy_flow" PointName:"Energy Flow" PointIgnoreZero:"false" PointArrayFlatten:"true"`
HasAmmeter valueTypes.Bool `json:"has_ammeter"`
InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"`
InverterSn valueTypes.String `json:"inverter_sn"`
OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"`
- P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointUpdateFreq:"UpdateFreqInstant"`
+ P13003Map valueTypes.UnitValue `json:"p13003_map" PointId:"p13003" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13003MapVirgin valueTypes.UnitValue `json:"p13003_map_virgin" PointIgnore:"true"`
- P13011Map valueTypes.UnitValue `json:"p13011_map" PointId:"p13011" PointUpdateFreq:"UpdateFreqInstant"`
+ P13011Map valueTypes.UnitValue `json:"p13011_map" PointId:"p13011" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13011MapVirgin valueTypes.UnitValue `json:"p13011_map_virgin" PointIgnore:"true"`
- P13115Map valueTypes.UnitValue `json:"p13115_map" PointId:"p13115" PointUpdateFreq:"UpdateFreqInstant"`
+ P13115Map valueTypes.UnitValue `json:"p13115_map" PointId:"p13115" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13115MapVirgin valueTypes.UnitValue `json:"p13115_map_virgin" PointIgnore:"true"`
- P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointUpdateFreq:"UpdateFreqInstant"`
+ P13119Map valueTypes.UnitValue `json:"p13119_map" PointId:"p13119" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13119MapVirgin valueTypes.UnitValue `json:"p13119_map_virgin" PointIgnore:"true"`
- P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointUpdateFreq:"UpdateFreqInstant"`
+ P13121Map valueTypes.UnitValue `json:"p13121_map" PointId:"p13121" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13121MapVirgin valueTypes.UnitValue `json:"p13121_map_virgin" PointIgnore:"true"`
- P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointUpdateFreq:"UpdateFreqInstant"`
+ P13126Map valueTypes.UnitValue `json:"p13126_map" PointId:"p13126" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13126MapVirgin valueTypes.UnitValue `json:"p13126_map_virgin" PointIgnore:"true"`
- P13141 valueTypes.Float `json:"p13141" PointId:"p13141" PointUpdateFreq:"UpdateFreqInstant"`
- P13142 valueTypes.Float `json:"p13142" PointId:"p13142" PointUpdateFreq:"UpdateFreqInstant"`
- P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointUpdateFreq:"UpdateFreqInstant"`
+ P13141 valueTypes.Float `json:"p13141" PointId:"p13141" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
+ P13142 valueTypes.Float `json:"p13142" PointId:"p13142" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
+ P13149Map valueTypes.UnitValue `json:"p13149_map" PointId:"p13149" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13149MapVirgin valueTypes.UnitValue `json:"p13149_map_virgin" PointIgnore:"true"`
- P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointUpdateFreq:"UpdateFreqInstant"`
+ P13150Map valueTypes.UnitValue `json:"p13150_map" PointId:"p13150" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"`
- P13155 valueTypes.Float `json:"p13155" PointId:"p13155" PointUpdateFreq:"UpdateFreqInstant"`
+ P13155 valueTypes.Float `json:"p13155" PointId:"p13155" PointDeviceFrom:"PsKey" PointUpdateFreq:"UpdateFreqInstant"`
PsKey valueTypes.PsKey `json:"ps_key"`
UpdateTime valueTypes.DateTime `json:"update_time"`
UUID valueTypes.Integer `json:"uuid"`
- } `json:"storage_inverter_data" PointNameAppend:"false" PointNameFromChild:"PsKey" PointArrayFlatten:"false" DataTable:"true"`
+ EnergyFlow []valueTypes.Integer `json:"energy_flow" PointName:"Energy Flow" PointIgnoreZero:"false" PointArrayFlatten:"true"`
+ } `json:"storage_inverter_data" PointIdReplace:"true" PointIdFromChild:"PsKey" DataTable:"false"`
+
+ ActualEnergy []valueTypes.Float `json:"actual_energy" PointId:"actual_energy" PointName:"Actual Energy" PointUnitFrom:"ActualEnergyUnit" PointArrayFlatten:"true"`
+ PlanEnergy []valueTypes.Float `json:"plan_energy" PointUnitFrom:"PlanEnergyUnit" PointArrayFlatten:"true"`
- ActualEnergy []valueTypes.Float `json:"actual_energy" PointId:"actual_energy" PointName:"Actual Energy" PointUnitFrom:"ActualEnergyUnit" PointArrayFlatten:"true" DataTable:"true"`
ActualEnergyUnit valueTypes.String `json:"actual_energy_unit" PointId:"actual_energy_unit" PointIgnore:"true"`
AlarmCount valueTypes.Count `json:"alarm_count"`
AreaId interface{} `json:"area_id"`
@@ -122,83 +124,82 @@ type ResultData struct {
OperateYear valueTypes.String `json:"operate_year"`
OperationBusName valueTypes.String `json:"operation_bus_name"`
OwnerPsFaultStatus valueTypes.Integer `json:"owner_ps_fault_status"`
- P83012Value valueTypes.Float `json:"p83012_value" PointId:"p83012" PointUnitFrom:"P83012Unit"`
+ P83012Value valueTypes.Float `json:"p83012_value" PointId:"p83012" PointDeviceFrom:"" PointUnitFrom:"P83012Unit"`
P83012Unit valueTypes.String `json:"p83012_unit" PointId:"p83012_unit" PointIgnore:"true"`
- P83013Value valueTypes.Float `json:"p83013_value" PointId:"p83013" PointUnitFrom:"P83013Unit"`
+ P83013Value valueTypes.Float `json:"p83013_value" PointId:"p83013" PointDeviceFrom:"" PointUnitFrom:"P83013Unit"`
P83013Unit valueTypes.String `json:"p83013_unit" PointId:"p83013_unit" PointIgnore:"true"`
- P83036Value valueTypes.Float `json:"p83036_value" PointId:"p83036" PointUnitFrom:"P83036Unit"`
+ P83036Value valueTypes.Float `json:"p83036_value" PointId:"p83036" PointDeviceFrom:"" PointUnitFrom:"P83036Unit"`
P83036Unit valueTypes.String `json:"p83036_unit" PointId:"p83036_unit" PointIgnore:"true"`
- P83016 valueTypes.Float `json:"p83016" PointId:"p83016" PointUnitFrom:"P83016Unit"`
+ P83016 valueTypes.Float `json:"p83016" PointId:"p83016" PointDeviceFrom:"" PointUnitFrom:"P83016Unit"`
P83016Unit valueTypes.String `json:"p83016_unit" PointId:"p83016_unit" PointIgnore:"true"`
- P83017 valueTypes.Float `json:"p83017" PointId:"p83017" PointUnitFrom:"P83017Unit"`
+ P83017 valueTypes.Float `json:"p83017" PointId:"p83017" PointDeviceFrom:"" PointUnitFrom:"P83017Unit"`
P83017Unit valueTypes.String `json:"p83017_unit" PointId:"p83017_unit" PointIgnore:"true"`
- P83023 valueTypes.Float `json:"p83023" PointId:"p83023"`
+ P83023 valueTypes.Float `json:"p83023" PointId:"p83023" PointDeviceFrom:""`
P83023y valueTypes.String `json:"p83023y" PointId:"p83023y"`
P83023year valueTypes.String `json:"p83023year" PointId:"p83023y"`
P83023ym valueTypes.String `json:"p83023ym" PointId:"p83023ym"`
- P83043 valueTypes.Float `json:"p83043" PointId:"p83043"`
- P83044 valueTypes.Float `json:"p83044" PointId:"p83044"`
- P83045 valueTypes.Float `json:"p83045" PointId:"p83045"`
- P83072Map valueTypes.UnitValue `json:"p83072_map" PointId:"p83072"`
+ P83043 valueTypes.Float `json:"p83043" PointId:"p83043" PointDeviceFrom:""`
+ P83044 valueTypes.Float `json:"p83044" PointId:"p83044" PointDeviceFrom:""`
+ P83045 valueTypes.Float `json:"p83045" PointId:"p83045" PointDeviceFrom:""`
+ P83072Map valueTypes.UnitValue `json:"p83072_map" PointId:"p83072" PointDeviceFrom:""`
P83072MapVirgin valueTypes.UnitValue `json:"p83072_map_virgin" PointIgnore:"true"`
- P83073Map valueTypes.UnitValue `json:"p83073_map" PointId:"p83073"`
+ P83073Map valueTypes.UnitValue `json:"p83073_map" PointId:"p83073" PointDeviceFrom:""`
P83073MapVirgin valueTypes.UnitValue `json:"p83073_map_virgin" PointIgnore:"true"`
- P83074Map valueTypes.UnitValue `json:"p83074_map" PointId:"p83074"`
+ P83074Map valueTypes.UnitValue `json:"p83074_map" PointId:"p83074" PointDeviceFrom:""`
P83074MapVirgin valueTypes.UnitValue `json:"p83074_map_virgin" PointIgnore:"true"`
- P83075Map valueTypes.UnitValue `json:"p83075_map" PointId:"p83075"`
+ P83075Map valueTypes.UnitValue `json:"p83075_map" PointId:"p83075" PointDeviceFrom:""`
P83075MapVirgin valueTypes.UnitValue `json:"p83075_map_virgin" PointIgnore:"true"`
- P83076Map valueTypes.UnitValue `json:"p83076_map" PointName:"Pv Power" PointId:"p83076"` // Pv Power
+ P83076Map valueTypes.UnitValue `json:"p83076_map" PointName:"Pv Power" PointId:"p83076" PointDeviceFrom:""` // Pv Power
P83076MapVirgin valueTypes.UnitValue `json:"p83076_map_virgin" PointIgnore:"true"`
- P83077Map valueTypes.UnitValue `json:"p83077_map" PointName:"Pv Energy" PointId:"p83077"` // Pv Energy
+ P83077Map valueTypes.UnitValue `json:"p83077_map" PointName:"Pv Energy" PointId:"p83077" PointDeviceFrom:""` // Pv Energy
P83077MapVirgin valueTypes.UnitValue `json:"p83077_map_virgin" PointIgnore:"true"`
- P83078Map valueTypes.UnitValue `json:"p83078_map" PointId:"p83078"`
+ P83078Map valueTypes.UnitValue `json:"p83078_map" PointId:"p83078" PointDeviceFrom:""`
P83078MapVirgin valueTypes.UnitValue `json:"p83078_map_virgin" PointIgnore:"true"`
- P83079Map valueTypes.UnitValue `json:"p83079_map" PointId:"p83079"`
+ P83079Map valueTypes.UnitValue `json:"p83079_map" PointId:"p83079" PointDeviceFrom:""`
P83079MapVirgin valueTypes.UnitValue `json:"p83079_map_virgin" PointIgnore:"true"`
- P83080Map valueTypes.UnitValue `json:"p83080_map" PointId:"p83080"`
+ P83080Map valueTypes.UnitValue `json:"p83080_map" PointId:"p83080" PointDeviceFrom:""`
P83080MapVirgin valueTypes.UnitValue `json:"p83080_map_virgin" PointIgnore:"true"`
- P83088Map valueTypes.UnitValue `json:"p83088_map" PointName:"ES Energy" PointId:"p83088"` // Es Energy
+ P83088Map valueTypes.UnitValue `json:"p83088_map" PointName:"ES Energy" PointId:"p83088" PointDeviceFrom:""` // Es Energy
P83088MapVirgin valueTypes.UnitValue `json:"p83088_map_virgin" PointIgnore:"true"`
- P83089Map valueTypes.UnitValue `json:"p83089_map" PointName:"ES Discharge Energy" PointId:"p83089"` // Es Discharge Energy
+ P83089Map valueTypes.UnitValue `json:"p83089_map" PointName:"ES Discharge Energy" PointId:"p83089" PointDeviceFrom:""` // Es Discharge Energy
P83089MapVirgin valueTypes.UnitValue `json:"p83089_map_virgin" PointIgnore:"true"`
- P83094Map valueTypes.UnitValue `json:"p83094_map" PointId:"p83094"`
+ P83094Map valueTypes.UnitValue `json:"p83094_map" PointId:"p83094" PointDeviceFrom:""`
P83094MapVirgin valueTypes.UnitValue `json:"p83094_map_virgin" PointIgnore:"true"`
- P83095Map valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointName:"ES Total Discharge Energy" PointUpdateFreq:"UpdateFreqTotal"` // Es Total Discharge Energy
+ P83095Map valueTypes.UnitValue `json:"p83095_map" PointId:"p83095" PointDeviceFrom:"" PointName:"ES Total Discharge Energy" PointUpdateFreq:"UpdateFreqTotal"` // Es Total Discharge Energy
P83095MapVirgin valueTypes.UnitValue `json:"p83095_map_virgin" PointIgnore:"true"`
- P83097Map valueTypes.UnitValue `json:"p83097_map" PointId:"p83097"`
+ P83097Map valueTypes.UnitValue `json:"p83097_map" PointId:"p83097" PointDeviceFrom:""`
P83097MapVirgin valueTypes.UnitValue `json:"p83097_map_virgin" PointIgnore:"true"`
- P83100Map valueTypes.UnitValue `json:"p83100_map" PointId:"p83100"`
+ P83100Map valueTypes.UnitValue `json:"p83100_map" PointId:"p83100" PointDeviceFrom:""`
P83100MapVirgin valueTypes.UnitValue `json:"p83100_map_virgin" PointIgnore:"true"`
- P83101Map valueTypes.UnitValue `json:"p83101_map" PointId:"p83101"`
+ P83101Map valueTypes.UnitValue `json:"p83101_map" PointId:"p83101" PointDeviceFrom:""`
P83101MapVirgin valueTypes.UnitValue `json:"p83101_map_virgin" PointIgnore:"true"`
- P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102"`
+ P83102Map valueTypes.UnitValue `json:"p83102_map" PointId:"p83102" PointDeviceFrom:""`
P83102MapVirgin valueTypes.UnitValue `json:"p83102_map_virgin" PointIgnore:"true"`
- P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102"`
- P83105Map valueTypes.UnitValue `json:"p83105_map" PointId:"p83105"`
+ P83102Percent valueTypes.Float `json:"p83102_percent" PointId:"p83102" PointDeviceFrom:""`
+ P83105Map valueTypes.UnitValue `json:"p83105_map" PointId:"p83105" PointDeviceFrom:""`
P83105MapVirgin valueTypes.UnitValue `json:"p83105_map_virgin" PointIgnore:"true"`
- P83106Map valueTypes.UnitValue `json:"p83106_map" PointId:"p83106"`
+ P83106Map valueTypes.UnitValue `json:"p83106_map" PointId:"p83106" PointDeviceFrom:""`
P83106MapVirgin valueTypes.UnitValue `json:"p83106_map_virgin" PointIgnore:"true"`
- P83107Map valueTypes.UnitValue `json:"p83107_map" PointId:"p83107"`
+ P83107Map valueTypes.UnitValue `json:"p83107_map" PointId:"p83107" PointDeviceFrom:""`
P83107MapVirgin valueTypes.UnitValue `json:"p83107_map_virgin" PointIgnore:"true"`
- P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118"`
+ P83118Map valueTypes.UnitValue `json:"p83118_map" PointId:"p83118" PointDeviceFrom:""`
P83118MapVirgin valueTypes.UnitValue `json:"p83118_map_virgin" PointIgnore:"true"`
- P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119"`
+ P83119Map valueTypes.UnitValue `json:"p83119_map" PointId:"p83119" PointDeviceFrom:""`
P83119MapVirgin valueTypes.UnitValue `json:"p83119_map_virgin" PointIgnore:"true"`
- P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120"`
+ P83120Map valueTypes.UnitValue `json:"p83120_map" PointId:"p83120" PointDeviceFrom:""`
P83120MapVirgin valueTypes.UnitValue `json:"p83120_map_virgin" PointIgnore:"true"`
- P83121 valueTypes.Float `json:"p83121" PointId:"p83121"`
- P83122 valueTypes.Float `json:"p83122" PointId:"p83122"`
- P83123Map valueTypes.UnitValue `json:"p83123_map" PointId:"p83123"`
+ P83121 valueTypes.Float `json:"p83121" PointId:"p83121" PointDeviceFrom:""`
+ P83122 valueTypes.Float `json:"p83122" PointId:"p83122" PointDeviceFrom:""`
+ P83123Map valueTypes.UnitValue `json:"p83123_map" PointId:"p83123" PointDeviceFrom:""`
P83123MapVirgin valueTypes.UnitValue `json:"p83123_map_virgin" PointIgnore:"true"`
- P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124"`
+ P83124Map valueTypes.UnitValue `json:"p83124_map" PointId:"p83124" PointDeviceFrom:""`
P83124MapVirgin valueTypes.UnitValue `json:"p83124_map_virgin" PointIgnore:"true"`
- P83125 valueTypes.Float `json:"p83125" PointId:"p83125"`
- P83126 valueTypes.Float `json:"p83126" PointId:"p83126"`
+ P83125 valueTypes.Float `json:"p83125" PointId:"p83125" PointDeviceFrom:""`
+ P83126 valueTypes.Float `json:"p83126" PointId:"p83126" PointDeviceFrom:""`
P83128MapVirgin valueTypes.UnitValue `json:"p83128_map_virgin" PointIgnore:"true"`
- P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202"`
+ P83202Map valueTypes.UnitValue `json:"p83202_map" PointId:"p83202" PointDeviceFrom:""`
P83202MapVirgin valueTypes.UnitValue `json:"p83202_map_virgin" PointIgnore:"true"`
PercentPlanYear valueTypes.Float `json:"percent_plan_year"`
- PlanEnergy []valueTypes.Float `json:"plan_energy" PointUnitFrom:"PlanEnergyUnit" PointArrayFlatten:"true" DataTable:"true"`
PlanEnergyUnit valueTypes.String `json:"plan_energy_unit" PointId:"plan_energy_unit" PointIgnore:"true"`
PlanEnergyYear valueTypes.UnitValue `json:"plan_energy_year"`
PowderReduce valueTypes.UnitValue `json:"powder_reduce"`
@@ -254,12 +255,6 @@ type ResultData struct {
func (e *ResultData) IsValid() error {
var err error
- // switch {
- // case e.Dummy == "":
- // break
- // default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- // }
return err
}
@@ -268,51 +263,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.PsId.String()
entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
-
- // dstEndpoint := "virtual." + e.Request.PsId.String()
- // srcEndpoint := fmt.Sprintf("%s.%s", pkg, e.Request.PsId.String())
- //
- // someting := entries.CopyPoint(srcEndpoint + ".p8301", dstEndpoint, "p8301", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83012", dstEndpoint, "p83012", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83013", dstEndpoint, "p83013", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83016", dstEndpoint, "p83016", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83017", dstEndpoint, "p83017", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p8302", dstEndpoint, "p8302", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83023", dstEndpoint, "p83023", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83036", dstEndpoint, "p83036", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p8304", dstEndpoint, "p8304", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83072", dstEndpoint, "p83072", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83073", dstEndpoint, "p83073", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83074", dstEndpoint, "p83074", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83075", dstEndpoint, "p83075", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83076", dstEndpoint, "p83076", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83077", dstEndpoint, "p83077", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83078", dstEndpoint, "p83078", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83079", dstEndpoint, "p83079", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83080", dstEndpoint, "p83080", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83088", dstEndpoint, "p83088", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83089", dstEndpoint, "p83089", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83094", dstEndpoint, "p83094", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83095", dstEndpoint, "p83095", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83097", dstEndpoint, "p83097", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83100", dstEndpoint, "p83100", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83101", dstEndpoint, "p83101", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83102", dstEndpoint, "p83102", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83105", dstEndpoint, "p83105", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83106", dstEndpoint, "p83106", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83107", dstEndpoint, "p83107", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83118", dstEndpoint, "p83118", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83119", dstEndpoint, "p83119", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p8312", dstEndpoint, "p8312", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83120", dstEndpoint, "p83120", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83123", dstEndpoint, "p83123", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83124", dstEndpoint, "p83124", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83128", dstEndpoint, "p83128", "")
- // someting := entries.CopyPoint(srcEndpoint + ".p83202", dstEndpoint, "p83202", "")
}
return entries
diff --git a/iSolarCloud/AppService/getPsDetail/struct.go b/iSolarCloud/AppService/getPsDetail/struct.go
index 3caf05834..2fe560231 100644
--- a/iSolarCloud/AppService/getPsDetail/struct.go
+++ b/iSolarCloud/AppService/getPsDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsDetailByUserTokens/data.go b/iSolarCloud/AppService/getPsDetailByUserTokens/data.go
index 475dafd05..b1dc7e702 100644
--- a/iSolarCloud/AppService/getPsDetailByUserTokens/data.go
+++ b/iSolarCloud/AppService/getPsDetailByUserTokens/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go b/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go
index ef6a99067..e7db5f522 100644
--- a/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go
+++ b/iSolarCloud/AppService/getPsDetailByUserTokens/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsDetailForSinglePage/data.go b/iSolarCloud/AppService/getPsDetailForSinglePage/data.go
index 2a62ecd79..ade6847cd 100644
--- a/iSolarCloud/AppService/getPsDetailForSinglePage/data.go
+++ b/iSolarCloud/AppService/getPsDetailForSinglePage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go b/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go
index 4f1cf136e..9d619cf6c 100644
--- a/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go
+++ b/iSolarCloud/AppService/getPsDetailForSinglePage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsDetailWithPsType/data.go b/iSolarCloud/AppService/getPsDetailWithPsType/data.go
index 3d4fcbd71..6a242ae1c 100644
--- a/iSolarCloud/AppService/getPsDetailWithPsType/data.go
+++ b/iSolarCloud/AppService/getPsDetailWithPsType/data.go
@@ -27,7 +27,7 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- BatteryLevelPercent valueTypes.Integer `json:"battery_level_percent" PointId:"battery_level_percent" PointUnit:"%" PointUpdateFreq:"UpdateFreqInstant"`
+ BatteryLevelPercent valueTypes.Float `json:"battery_level_percent" PointId:"battery_level_percent" PointUnit:"%" PointUpdateFreq:"UpdateFreqInstant"`
ChargingDischargingPowerMap valueTypes.UnitValue `json:"charging_discharging_power_map" PointId:"charging_discharging_power_map" PointUpdateFreq:"UpdateFreqInstant"` // Holds the battery charge/discharge amount
Co2ReduceTotal valueTypes.UnitValue `json:"co2_reduce_total" PointId:"co2_reduce_total" PointUpdateFreq:"UpdateFreqTotal"`
CoalReduceTotal valueTypes.UnitValue `json:"coal_reduce_total" PointId:"coal_reduce_total" PointUpdateFreq:"UpdateFreqTotal"`
@@ -123,7 +123,7 @@ type ResultData struct {
P13150MapVirgin valueTypes.UnitValue `json:"p13150_map_virgin" PointIgnore:"true"`
PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"`
UUID valueTypes.Integer `json:"uuid" PointId:"uuid" PointUpdateFreq:"UpdateFreqBoot"`
- } `json:"storage_inverter_data" PointNameFromChild:"PsKey" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"storage_inverter_data" PointIdFromChild:"PsKey" PointIdReplace:"true" DataTable:"false"`
TodayEnergy valueTypes.UnitValue `json:"today_energy" PointId:"today_energy" PointUpdateFreq:"UpdateFreqDay"`
TodayEnergyVirgin valueTypes.UnitValue `json:"today_energy_virgin" PointIgnore:"true"`
TodayIncome valueTypes.UnitValue `json:"today_income" PointId:"today_income" PointUpdateFreq:"UpdateFreqDay"`
@@ -142,12 +142,6 @@ type ResultData struct {
func (e *ResultData) IsValid() error {
var err error
- //switch {
- //case e.Dummy == "":
- // break
- //default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- //}
return err
}
@@ -157,7 +151,7 @@ func (e *EndPoint) GetData() api.DataMap {
for range Only.Once {
pkg := reflection.GetName("", *e)
// name := api.JoinWithDots(0, valueTypes.DateTimeLayoutDay, pkg, e.Response.ResultData.PsPsKey)
- entries.StructToDataMap(*e, e.Response.ResultData.PsPsKey.Value(), GoStruct.NewEndPointPath(e.Response.ResultData.PsPsKey.Value()))
+ entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
dstEndpoint := "virtual." + e.Request.PsId.String()
srcEndpoint := fmt.Sprintf("%s.%s", pkg, e.Response.ResultData.PsPsKey.Value())
diff --git a/iSolarCloud/AppService/getPsDetailWithPsType/struct.go b/iSolarCloud/AppService/getPsDetailWithPsType/struct.go
index 0ee82ee83..104da7d61 100644
--- a/iSolarCloud/AppService/getPsDetailWithPsType/struct.go
+++ b/iSolarCloud/AppService/getPsDetailWithPsType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsHealthState/struct.go b/iSolarCloud/AppService/getPsHealthState/struct.go
index b45a7cf7e..36f47e767 100644
--- a/iSolarCloud/AppService/getPsHealthState/struct.go
+++ b/iSolarCloud/AppService/getPsHealthState/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsInstallerByPsId/data.go b/iSolarCloud/AppService/getPsInstallerByPsId/data.go
index e7b3b0ded..3d9450d32 100644
--- a/iSolarCloud/AppService/getPsInstallerByPsId/data.go
+++ b/iSolarCloud/AppService/getPsInstallerByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsInstallerByPsId/struct.go b/iSolarCloud/AppService/getPsInstallerByPsId/struct.go
index 7c350866d..6ce294ce2 100644
--- a/iSolarCloud/AppService/getPsInstallerByPsId/struct.go
+++ b/iSolarCloud/AppService/getPsInstallerByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go
index bd3293b3e..ad3e768bf 100644
--- a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go
+++ b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go
index 95cebbee3..3ab043e2d 100644
--- a/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go
+++ b/iSolarCloud/AppService/getPsInstallerOrgInfoByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsList/data.go b/iSolarCloud/AppService/getPsList/data.go
index ead647d54..7e707bdd3 100644
--- a/iSolarCloud/AppService/getPsList/data.go
+++ b/iSolarCloud/AppService/getPsList/data.go
@@ -27,6 +27,8 @@ func (rd RequestData) Help() string {
type ResultData struct {
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"GoStruct" PointDeviceFrom:"PsId"`
+
Images Common.PowerStationImages `json:"images" PointArrayFlatten:"false"`
AlarmCount valueTypes.Count `json:"alarm_count" PointId:"alarm_count" PointUpdateFreq:"UpdateFreqBoot"`
@@ -144,18 +146,12 @@ type ResultData struct {
WgsLatitude valueTypes.Float `json:"wgs_latitude" PointId:"wgs_latitude"`
WgsLongitude valueTypes.Float `json:"wgs_longitude" PointId:"wgs_longitude"`
ZipCode valueTypes.String `json:"zip_code" PointId:"zip_code"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
- RowCount valueTypes.Count `json:"rowCount" PointId:"row_count" PointIgnore:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsId" PointIdReplace:"true"`
+ RowCount valueTypes.Count `json:"rowCount" PointId:"row_count"`
}
func (e *ResultData) IsValid() error {
var err error
- // switch {
- // case e.Dummy == "":
- // break
- // default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- // }
return err
}
@@ -163,9 +159,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
}
diff --git a/iSolarCloud/AppService/getPsList/struct.go b/iSolarCloud/AppService/getPsList/struct.go
index c900b0ce0..dca873441 100644
--- a/iSolarCloud/AppService/getPsList/struct.go
+++ b/iSolarCloud/AppService/getPsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsListByName/data.go b/iSolarCloud/AppService/getPsListByName/data.go
index ccabd5bea..624a2ab91 100644
--- a/iSolarCloud/AppService/getPsListByName/data.go
+++ b/iSolarCloud/AppService/getPsListByName/data.go
@@ -51,7 +51,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsListByName/struct.go b/iSolarCloud/AppService/getPsListByName/struct.go
index 3998e59b3..7d3caa654 100644
--- a/iSolarCloud/AppService/getPsListByName/struct.go
+++ b/iSolarCloud/AppService/getPsListByName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go b/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go
index b45e66c41..fadddf6e4 100644
--- a/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go
+++ b/iSolarCloud/AppService/getPsListForPsDataByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go b/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go
index e3a0ed9ab..fe2a2e092 100644
--- a/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go
+++ b/iSolarCloud/AppService/getPsListForPsDataByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsListStaticData/data.go b/iSolarCloud/AppService/getPsListStaticData/data.go
index 09874b132..1e0361097 100644
--- a/iSolarCloud/AppService/getPsListStaticData/data.go
+++ b/iSolarCloud/AppService/getPsListStaticData/data.go
@@ -26,6 +26,8 @@ func (rd RequestData) Help() string {
type ResultData struct {
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"GoStruct" PointDeviceFrom:"PsId"`
+
AreaId interface{} `json:"area_id"`
DesignCapacity valueTypes.Float `json:"design_capacity" PointUnit:"W"`
GprsLatitude valueTypes.Float `json:"gprs_latitude"`
@@ -46,18 +48,12 @@ type ResultData struct {
PsType valueTypes.Integer `json:"ps_type"`
ValidFlag valueTypes.Bool `json:"valid_flag"`
WaitAssignOrderCount valueTypes.Integer `json:"wait_assign_order_count"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsId" PointIdReplace:"true" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
func (e *ResultData) IsValid() error {
var err error
- //switch {
- //case e.Dummy == "":
- // break
- //default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- //}
return err
}
@@ -65,10 +61,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsListStaticData/struct.go b/iSolarCloud/AppService/getPsListStaticData/struct.go
index b5126592f..8e5b47153 100644
--- a/iSolarCloud/AppService/getPsListStaticData/struct.go
+++ b/iSolarCloud/AppService/getPsListStaticData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsReport/data.go b/iSolarCloud/AppService/getPsReport/data.go
index 25f652d3d..2622f30c5 100644
--- a/iSolarCloud/AppService/getPsReport/data.go
+++ b/iSolarCloud/AppService/getPsReport/data.go
@@ -27,30 +27,32 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- PsDateRangeTotalData TotalData `json:"ps_date_range_total_data" DataTable:"true"`
- PsTotalData TotalData `json:"ps_total_data" DataTable:"true"`
+ PsDateRangeTotalData TotalData `json:"ps_date_range_total_data"`
+ PsTotalData TotalData `json:"ps_total_data"`
ReportListData struct {
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsId"`
+
PsId valueTypes.PsId `json:"ps_id"`
PsName valueTypes.String `json:"ps_name"`
PsType valueTypes.Integer `json:"ps_type"`
ShareType valueTypes.String `json:"share_type"`
- Co2Reduce valueTypes.Float `json:"co2_reduce" PointUnitFromParent:"PsTotalCo2ReduceUnit"`
- PowerQuantityTotal valueTypes.Float `json:"power_quantity_total" PointUnitFromParent:"PowerQuantityTotalUnit"`
+ Co2Reduce valueTypes.Float `json:"co2_reduce" PointUnitFromParent:"PsTotalCo2ReduceUnit" PointUpdateFreq:"UpdateFreqTotal"`
+ PowerQuantityTotal valueTypes.Float `json:"power_quantity_total" PointUnitFromParent:"PowerQuantityTotalUnit" PointUpdateFreq:"UpdateFreqTotal"`
PsInstalledPower valueTypes.Float `json:"ps_installed_power" PointUnitFromParent:"PsInstalledPowerUnit"`
- PsTotalCo2Reduce valueTypes.Float `json:"ps_total_co2_reduce" PointUnitFromParent:"PsTotalCo2ReduceUnit"`
- PsTotalPower valueTypes.Float `json:"ps_total_power" PointUnitFromParent:"PsTotalPowerUnit"`
+ PsTotalCo2Reduce valueTypes.Float `json:"ps_total_co2_reduce" PointUnitFromParent:"PsTotalCo2ReduceUnit" PointUpdateFreq:"UpdateFreqTotal"`
+ PsTotalPower valueTypes.Float `json:"ps_total_power" PointUnitFromParent:"PsTotalPowerUnit" PointUpdateFreq:"UpdateFreqTotal"`
TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"`
IncomeUnitName valueTypes.String `json:"income_unit_name" PointIgnore:"true"`
- ProfitList ProfitList `json:"profit_list" DataTable:"true"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ ProfitList []Profit `json:"profit_list" PointIdReplace:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsId" PointIdReplace:"true"`
Co2ReduceUnit valueTypes.String `json:"co2_reduce_unit" PointIgnore:"true"`
PowerQuantityTotalUnit valueTypes.String `json:"power_quantity_total_unit" PointIgnore:"true"`
PsInstalledPowerUnit valueTypes.String `json:"ps_installed_power_unit" PointIgnore:"true"`
PsTotalCo2ReduceUnit valueTypes.String `json:"ps_total_co2_reduce_unit" PointIgnore:"true"`
PsTotalPowerUnit valueTypes.String `json:"ps_total_power_unit" PointIgnore:"true"`
- RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
- } `json:"report_list_data" PointId:"total_by_ps" PointNameAppend:"false"`
+ RowCount valueTypes.Count `json:"rowCount" PointId:"row_count"`
+ } `json:"report_list_data" PointId:"total_by_ps" PointIdReplace:"true"`
}
type TotalData struct {
@@ -64,11 +66,11 @@ type TotalData struct {
PowerQuantityTotalMap valueTypes.UnitValue `json:"power_quantity_total_map"`
PowerQuantityTotalOriginalUnit valueTypes.String `json:"power_quantity_total_original_unit" PointIgnore:"true"`
- ProfitList ProfitList `json:"profit_list" PointArrayFlatten:"false"`
TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"`
+ ProfitList []Profit `json:"profit_list" PointIdReplace:"true"`
}
-type ProfitList []struct {
+type Profit struct {
IncomeUnitId valueTypes.Integer `json:"income_unit_id"`
IncomeUnitName valueTypes.String `json:"income_unit_name" PointIgnore:"true"`
TotalProfit valueTypes.Float `json:"total_profit" PointUnitFrom:"IncomeUnitName"`
@@ -76,12 +78,6 @@ type ProfitList []struct {
func (e *ResultData) IsValid() error {
var err error
- // switch {
- // case e.Dummy == "":
- // break
- // default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- // }
return err
}
@@ -89,10 +85,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.DateId.Format(valueTypes.DateTimeLayoutDay)
- entries.StructToDataMap(*e, "system", GoStruct.NewEndPointPath(e.Request.DateId.Format(valueTypes.DateTimeLayoutDay)))
+ entries.StructToDataMap(*e, "", GoStruct.NewEndPointPath(e.Request.DateId.Format(valueTypes.DateTimeLayoutDay)))
}
return entries
diff --git a/iSolarCloud/AppService/getPsReport/struct.go b/iSolarCloud/AppService/getPsReport/struct.go
index d4812fbe3..62a6d6bda 100644
--- a/iSolarCloud/AppService/getPsReport/struct.go
+++ b/iSolarCloud/AppService/getPsReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsUser/data.go b/iSolarCloud/AppService/getPsUser/data.go
index da098d9d7..d0dfa9fbe 100644
--- a/iSolarCloud/AppService/getPsUser/data.go
+++ b/iSolarCloud/AppService/getPsUser/data.go
@@ -127,7 +127,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getPsUser/struct.go b/iSolarCloud/AppService/getPsUser/struct.go
index 0292fed1e..fe9063242 100644
--- a/iSolarCloud/AppService/getPsUser/struct.go
+++ b/iSolarCloud/AppService/getPsUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getPsWeatherList/data.go b/iSolarCloud/AppService/getPsWeatherList/data.go
index fdfb01bf0..349277f46 100644
--- a/iSolarCloud/AppService/getPsWeatherList/data.go
+++ b/iSolarCloud/AppService/getPsWeatherList/data.go
@@ -43,7 +43,7 @@ type ResultData struct {
Sunrise valueTypes.Time `json:"sunrise"`
Sunset valueTypes.Time `json:"sunset"`
Visibility valueTypes.Float `json:"visibility"`
- } `json:"weather_list" PointNameFromChild:"DateTime" PointNameDateFormat:"20060102" DataTable:"true"`
+ } `json:"weather_list" PointIdFromChild:"DateTime" PointNameDateFormat:"20060102" DataTable:"true"`
}
func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/getPsWeatherList/struct.go b/iSolarCloud/AppService/getPsWeatherList/struct.go
index cc83a3154..31948df98 100644
--- a/iSolarCloud/AppService/getPsWeatherList/struct.go
+++ b/iSolarCloud/AppService/getPsWeatherList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRechargeOrderDetail/data.go b/iSolarCloud/AppService/getRechargeOrderDetail/data.go
index 3df62e66c..fcbb0ea25 100644
--- a/iSolarCloud/AppService/getRechargeOrderDetail/data.go
+++ b/iSolarCloud/AppService/getRechargeOrderDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRechargeOrderDetail/struct.go b/iSolarCloud/AppService/getRechargeOrderDetail/struct.go
index 34aac849a..c69186bcd 100644
--- a/iSolarCloud/AppService/getRechargeOrderDetail/struct.go
+++ b/iSolarCloud/AppService/getRechargeOrderDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go
index 10876776d..f0df4b2b5 100644
--- a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go
+++ b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go
index eddf81515..6036d00ef 100644
--- a/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go
+++ b/iSolarCloud/AppService/getRechargeOrderItemDeviceList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRechargeOrderList/data.go b/iSolarCloud/AppService/getRechargeOrderList/data.go
index 22102388f..12b8d0ddf 100644
--- a/iSolarCloud/AppService/getRechargeOrderList/data.go
+++ b/iSolarCloud/AppService/getRechargeOrderList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRechargeOrderList/struct.go b/iSolarCloud/AppService/getRechargeOrderList/struct.go
index 0ea759d79..63cf85ef5 100644
--- a/iSolarCloud/AppService/getRechargeOrderList/struct.go
+++ b/iSolarCloud/AppService/getRechargeOrderList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRegionalTree/data.go b/iSolarCloud/AppService/getRegionalTree/data.go
index 1c3eac729..cb1bb5211 100644
--- a/iSolarCloud/AppService/getRegionalTree/data.go
+++ b/iSolarCloud/AppService/getRegionalTree/data.go
@@ -74,7 +74,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRegionalTree/struct.go b/iSolarCloud/AppService/getRegionalTree/struct.go
index 5e77f154b..81b56f464 100644
--- a/iSolarCloud/AppService/getRegionalTree/struct.go
+++ b/iSolarCloud/AppService/getRegionalTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRemoteParamSettingList/data.go b/iSolarCloud/AppService/getRemoteParamSettingList/data.go
index 3054c7caf..f0117d082 100644
--- a/iSolarCloud/AppService/getRemoteParamSettingList/data.go
+++ b/iSolarCloud/AppService/getRemoteParamSettingList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRemoteParamSettingList/struct.go b/iSolarCloud/AppService/getRemoteParamSettingList/struct.go
index 87bc362ef..19332ea23 100644
--- a/iSolarCloud/AppService/getRemoteParamSettingList/struct.go
+++ b/iSolarCloud/AppService/getRemoteParamSettingList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
index e42cd0ad5..0303fb6a4 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/data.go
@@ -27,7 +27,7 @@ func (rd RequestData) Help() string {
type ResultData struct {
MModuleNameList []valueTypes.String `json:"m_module_name_list"`
- PageList []interface{} `json:"pageList" PointId:"page_list" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -65,7 +65,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go
index cd16229b7..09c23d7c8 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeDeviceList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go
index d3ec20a14..39b51a6ef 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go
index 2cc582dfc..dd19b9243 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeScheduleDetails/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go
index efb4c1332..8b90adb84 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- PageList []interface{} `json:"pageList" PointId:"page_list" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -64,7 +64,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go
index 232bad1e2..b2fee99ca 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeSubTasksList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go b/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go
index d26574499..c5b14db89 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeTaskList/data.go
@@ -47,7 +47,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go b/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go
index b131a7a28..79894875f 100644
--- a/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go
+++ b/iSolarCloud/AppService/getRemoteUpgradeTaskList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getReportData/data.go b/iSolarCloud/AppService/getReportData/data.go
index ba5c53914..f86a1fc76 100644
--- a/iSolarCloud/AppService/getReportData/data.go
+++ b/iSolarCloud/AppService/getReportData/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- DataList []DataList `json:"dataList" PointId:"data_list" PointIgnoreIfNilFromChild:"UpdateTime" PointNameFromChild:"DateId" PointNameDateFormat:"20060102" PointNameAppend:"true" PointArrayFlatten:"false" DataTable:"true"`
+ DataList []DataList `json:"dataList" PointId:"data_list" PointIgnoreChildIfFromNil:"UpdateTime" PointIdFromChild:"DateId" PointNameDateFormat:"20060102" PointIdReplace:"false" PointArrayFlatten:"false" DataTable:"true"`
Info []struct {
DesignCapacity valueTypes.Float `json:"design_capacity" PointUnit:"W"`
InstallerPsFaultStatus valueTypes.Integer `json:"installer_ps_fault_status"`
@@ -42,7 +42,7 @@ type ResultData struct {
ValidFlag valueTypes.Bool `json:"valid_flag"`
} `json:"info" PointArrayFlatten:"false" DataTable:"true"`
MinDateId interface{} `json:"min_date_id"`
- Total []DataList `json:"total" PointId:"total" PointIgnoreIfNilFromChild:"UpdateTime" PointNameFromChild:"DateId" PointNameDateFormat:"20060102" PointNameAppend:"true" PointArrayFlatten:"false" DataTable:"true"`
+ Total []DataList `json:"total" PointId:"total" PointIgnoreChildIfFromNil:"UpdateTime" PointIdFromChild:"DateId" PointNameDateFormat:"20060102" PointIdReplace:"false" PointArrayFlatten:"false" DataTable:"true"`
}
type DataList struct {
DateId valueTypes.DateTime `json:"date_id"`
diff --git a/iSolarCloud/AppService/getReportData/struct.go b/iSolarCloud/AppService/getReportData/struct.go
index 760c2b242..6a47480e2 100644
--- a/iSolarCloud/AppService/getReportData/struct.go
+++ b/iSolarCloud/AppService/getReportData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
index ad2ec322d..c8c493432 100644
--- a/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
+++ b/iSolarCloud/AppService/getReportEmailConfigInfo/data.go
@@ -85,7 +85,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go b/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go
index 5f7dced54..ad34cd4fa 100644
--- a/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go
+++ b/iSolarCloud/AppService/getReportEmailConfigInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getReportExportColumns/data.go b/iSolarCloud/AppService/getReportExportColumns/data.go
index 02115d4f8..9a8ba4df7 100644
--- a/iSolarCloud/AppService/getReportExportColumns/data.go
+++ b/iSolarCloud/AppService/getReportExportColumns/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getReportExportColumns/struct.go b/iSolarCloud/AppService/getReportExportColumns/struct.go
index 1aaf3de82..28217f1f1 100644
--- a/iSolarCloud/AppService/getReportExportColumns/struct.go
+++ b/iSolarCloud/AppService/getReportExportColumns/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getReportListByUserId/data.go b/iSolarCloud/AppService/getReportListByUserId/data.go
index 1a80a150d..62de32537 100644
--- a/iSolarCloud/AppService/getReportListByUserId/data.go
+++ b/iSolarCloud/AppService/getReportListByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getReportListByUserId/struct.go b/iSolarCloud/AppService/getReportListByUserId/struct.go
index a72a53c61..e38f5907a 100644
--- a/iSolarCloud/AppService/getReportListByUserId/struct.go
+++ b/iSolarCloud/AppService/getReportListByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go b/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go
index 7efe7c2f8..fd8a171db 100644
--- a/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go
+++ b/iSolarCloud/AppService/getRobotDynamicCleaningView/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go
index 808031b0a..cf08b52b6 100644
--- a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go
+++ b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go
index 55471c741..3b54d0057 100644
--- a/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go
+++ b/iSolarCloud/AppService/getRobotNumAndSweepCapacity/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getRuleUnit/data.go b/iSolarCloud/AppService/getRuleUnit/data.go
index ed24ea87c..b3ffbce23 100644
--- a/iSolarCloud/AppService/getRuleUnit/data.go
+++ b/iSolarCloud/AppService/getRuleUnit/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getRuleUnit/struct.go b/iSolarCloud/AppService/getRuleUnit/struct.go
index 54ea9dbc5..d31c78a3e 100644
--- a/iSolarCloud/AppService/getRuleUnit/struct.go
+++ b/iSolarCloud/AppService/getRuleUnit/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSendReportConfigCron/data.go b/iSolarCloud/AppService/getSendReportConfigCron/data.go
index 16afc2490..b78ca15b5 100644
--- a/iSolarCloud/AppService/getSendReportConfigCron/data.go
+++ b/iSolarCloud/AppService/getSendReportConfigCron/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSendReportConfigCron/struct.go b/iSolarCloud/AppService/getSendReportConfigCron/struct.go
index a0028fb2d..8be708b3d 100644
--- a/iSolarCloud/AppService/getSendReportConfigCron/struct.go
+++ b/iSolarCloud/AppService/getSendReportConfigCron/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSerialNum/data.go b/iSolarCloud/AppService/getSerialNum/data.go
index e36fe4bb1..522fe7447 100644
--- a/iSolarCloud/AppService/getSerialNum/data.go
+++ b/iSolarCloud/AppService/getSerialNum/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSerialNum/struct.go b/iSolarCloud/AppService/getSerialNum/struct.go
index 7dd209b67..58c8c9331 100644
--- a/iSolarCloud/AppService/getSerialNum/struct.go
+++ b/iSolarCloud/AppService/getSerialNum/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getShieldMapConditionList/data.go b/iSolarCloud/AppService/getShieldMapConditionList/data.go
index ddc73f20f..03142c34f 100644
--- a/iSolarCloud/AppService/getShieldMapConditionList/data.go
+++ b/iSolarCloud/AppService/getShieldMapConditionList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getShieldMapConditionList/struct.go b/iSolarCloud/AppService/getShieldMapConditionList/struct.go
index 845168112..63762cc19 100644
--- a/iSolarCloud/AppService/getShieldMapConditionList/struct.go
+++ b/iSolarCloud/AppService/getShieldMapConditionList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSimIdBySnList/data.go b/iSolarCloud/AppService/getSimIdBySnList/data.go
index 3d069ed7c..e2460b346 100644
--- a/iSolarCloud/AppService/getSimIdBySnList/data.go
+++ b/iSolarCloud/AppService/getSimIdBySnList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSimIdBySnList/struct.go b/iSolarCloud/AppService/getSimIdBySnList/struct.go
index 083eccfd6..ccf453d40 100644
--- a/iSolarCloud/AppService/getSimIdBySnList/struct.go
+++ b/iSolarCloud/AppService/getSimIdBySnList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSingleIVData/data.go b/iSolarCloud/AppService/getSingleIVData/data.go
index 268466bd9..db640203d 100644
--- a/iSolarCloud/AppService/getSingleIVData/data.go
+++ b/iSolarCloud/AppService/getSingleIVData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSingleIVData/struct.go b/iSolarCloud/AppService/getSingleIVData/struct.go
index c12967388..1de1ed3a3 100644
--- a/iSolarCloud/AppService/getSingleIVData/struct.go
+++ b/iSolarCloud/AppService/getSingleIVData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSnChangeRecord/data.go b/iSolarCloud/AppService/getSnChangeRecord/data.go
index fe91d26c5..1de8f1bb2 100644
--- a/iSolarCloud/AppService/getSnChangeRecord/data.go
+++ b/iSolarCloud/AppService/getSnChangeRecord/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSnChangeRecord/struct.go b/iSolarCloud/AppService/getSnChangeRecord/struct.go
index 6d4a4289e..02824aee8 100644
--- a/iSolarCloud/AppService/getSnChangeRecord/struct.go
+++ b/iSolarCloud/AppService/getSnChangeRecord/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSnConnectionInfo/data.go b/iSolarCloud/AppService/getSnConnectionInfo/data.go
index 9461aa21b..4c8e29181 100644
--- a/iSolarCloud/AppService/getSnConnectionInfo/data.go
+++ b/iSolarCloud/AppService/getSnConnectionInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSnConnectionInfo/struct.go b/iSolarCloud/AppService/getSnConnectionInfo/struct.go
index 390bb86bb..0914ff8fa 100644
--- a/iSolarCloud/AppService/getSnConnectionInfo/struct.go
+++ b/iSolarCloud/AppService/getSnConnectionInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getStationInfoSql/data.go b/iSolarCloud/AppService/getStationInfoSql/data.go
index e4c5d23f1..bc662c491 100644
--- a/iSolarCloud/AppService/getStationInfoSql/data.go
+++ b/iSolarCloud/AppService/getStationInfoSql/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getStationInfoSql/struct.go b/iSolarCloud/AppService/getStationInfoSql/struct.go
index 4295c7066..59153444f 100644
--- a/iSolarCloud/AppService/getStationInfoSql/struct.go
+++ b/iSolarCloud/AppService/getStationInfoSql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSungwsConfigCache/data.go b/iSolarCloud/AppService/getSungwsConfigCache/data.go
index 1d3f6fddf..61de450ac 100644
--- a/iSolarCloud/AppService/getSungwsConfigCache/data.go
+++ b/iSolarCloud/AppService/getSungwsConfigCache/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSungwsConfigCache/struct.go b/iSolarCloud/AppService/getSungwsConfigCache/struct.go
index 37f7510c6..89c04f2d9 100644
--- a/iSolarCloud/AppService/getSungwsConfigCache/struct.go
+++ b/iSolarCloud/AppService/getSungwsConfigCache/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go b/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go
index d5cdd14d1..1873fb3e0 100644
--- a/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go
+++ b/iSolarCloud/AppService/getSungwsGlobalConfigCache/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go b/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go
index f354120b1..e1e7e7a7e 100644
--- a/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go
+++ b/iSolarCloud/AppService/getSungwsGlobalConfigCache/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go b/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go
index 31c4b8dea..00823de2b 100644
--- a/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go
+++ b/iSolarCloud/AppService/getSweepDevParamSetTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go b/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go
index f997e8fa5..e705c6a83 100644
--- a/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go
+++ b/iSolarCloud/AppService/getSweepDevParamSetTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSweepRobotDevList/data.go b/iSolarCloud/AppService/getSweepRobotDevList/data.go
index 76ac72795..aa7d2ef31 100644
--- a/iSolarCloud/AppService/getSweepRobotDevList/data.go
+++ b/iSolarCloud/AppService/getSweepRobotDevList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSweepRobotDevList/struct.go b/iSolarCloud/AppService/getSweepRobotDevList/struct.go
index 899d344b5..86985f9e8 100644
--- a/iSolarCloud/AppService/getSweepRobotDevList/struct.go
+++ b/iSolarCloud/AppService/getSweepRobotDevList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSysMsg/data.go b/iSolarCloud/AppService/getSysMsg/data.go
index 85fb13acc..2967d5419 100644
--- a/iSolarCloud/AppService/getSysMsg/data.go
+++ b/iSolarCloud/AppService/getSysMsg/data.go
@@ -4,15 +4,14 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/otherService/getSysMsg"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -25,93 +24,74 @@ func (rd RequestData) Help() string {
}
type ResultData []struct {
- AttachNames interface{} `json:"attach_names"`
- AttachPath interface{} `json:"attach_path"`
+ GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"CreateTime" PointIdReplace:"false"`
+
+ MsgId valueTypes.Integer `json:"msg_id"`
+ CreateTime valueTypes.DateTime `json:"create_time"`
+ PublishTime valueTypes.DateTime `json:"publish_time"`
+ StartTime valueTypes.DateTime `json:"start_time"`
+ EndTime valueTypes.DateTime `json:"end_time"`
+ Ispublish valueTypes.Bool `json:"ispublish" PointId:"is_publish"`
+ UserName valueTypes.String `json:"user_name"`
+ UserId valueTypes.Integer `json:"user_id"`
+ MsgUserIds valueTypes.String `json:"msg_user_ids"`
+ MsgLevel valueTypes.Integer `json:"msg_level"`
+ MsgTitleEnUs valueTypes.String `json:"msg_title_en_us"`
+ MsgContentsEnUs valueTypes.String `json:"msg_contents_en_us"`
+
+ TypeId valueTypes.Integer `json:"type_id"`
BusinessId valueTypes.Integer `json:"business_id"`
ClickNum valueTypes.Integer `json:"click_num"`
- CreateTime valueTypes.DateTime `json:"create_time"`
- EndTime valueTypes.DateTime `json:"end_time"`
- Ispublish valueTypes.Bool `json:"ispublish"`
- MsgContents valueTypes.String `json:"msg_contents"`
- MsgContentsDeDe valueTypes.String `json:"msg_contents_de_de"`
- MsgContentsEnUs valueTypes.String `json:"msg_contents_en_us"`
- MsgContentsEsEs valueTypes.String `json:"msg_contents_es_es"`
- MsgContentsFrFr valueTypes.String `json:"msg_contents_fr_fr"`
- MsgContentsIDID valueTypes.String `json:"msg_contents_id_id"`
- MsgContentsItIt valueTypes.String `json:"msg_contents_it_it"`
- MsgContentsJaJp valueTypes.String `json:"msg_contents_ja_jp"`
- MsgContentsKoKr valueTypes.String `json:"msg_contents_ko_kr"`
- MsgContentsNlNl valueTypes.String `json:"msg_contents_nl_nl"`
- MsgContentsPlPl valueTypes.String `json:"msg_contents_pl_pl"`
- MsgContentsPtBr valueTypes.String `json:"msg_contents_pt_br"`
- MsgContentsPtPt valueTypes.String `json:"msg_contents_pt_pt"`
- MsgContentsTrTr valueTypes.String `json:"msg_contents_tr_tr"`
- MsgContentsViVn valueTypes.String `json:"msg_contents_vi_vn"`
- MsgContentsZhTw valueTypes.String `json:"msg_contents_zh_tw"`
- MsgId valueTypes.Integer `json:"msg_id"`
- MsgLevel valueTypes.Integer `json:"msg_level"`
- MsgTitle valueTypes.String `json:"msg_title"`
- MsgTitleDeDe valueTypes.String `json:"msg_title_de_de"`
- MsgTitleEnUs valueTypes.String `json:"msg_title_en_us"`
- MsgTitleEsEs valueTypes.String `json:"msg_title_es_es"`
- MsgTitleFrFr valueTypes.String `json:"msg_title_fr_fr"`
- MsgTitleIDID valueTypes.String `json:"msg_title_id_id"`
- MsgTitleItIt valueTypes.String `json:"msg_title_it_it"`
- MsgTitleJaJp valueTypes.String `json:"msg_title_ja_jp"`
- MsgTitleKoKr valueTypes.String `json:"msg_title_ko_kr"`
- MsgTitleNlNl valueTypes.String `json:"msg_title_nl_nl"`
- MsgTitlePlPl valueTypes.String `json:"msg_title_pl_pl"`
- MsgTitlePtBr valueTypes.String `json:"msg_title_pt_br"`
- MsgTitlePtPt valueTypes.String `json:"msg_title_pt_pt"`
- MsgTitleTrTr valueTypes.String `json:"msg_title_tr_tr"`
- MsgTitleViVn valueTypes.String `json:"msg_title_vi_vn"`
- MsgTitleZhTw valueTypes.String `json:"msg_title_zh_tw"`
- MsgUserIds valueTypes.String `json:"msg_user_ids"`
+ RemindType valueTypes.Integer `json:"remind_type"`
OperateType valueTypes.Integer `json:"operate_type"`
OperateURL valueTypes.String `json:"operate_url"`
- PublishTime valueTypes.DateTime `json:"publish_time"`
- RemindType valueTypes.Integer `json:"remind_type"`
- StartTime valueTypes.DateTime `json:"start_time"`
- TypeId valueTypes.Integer `json:"type_id"`
- UserId valueTypes.Integer `json:"user_id"`
- UserName valueTypes.String `json:"user_name"`
+ AttachNames interface{} `json:"attach_names"`
+ AttachPath interface{} `json:"attach_path"`
+
+ MsgContents valueTypes.String `json:"msg_contents" PointIgnore:"true"`
+ MsgContentsDeDe valueTypes.String `json:"msg_contents_de_de" PointIgnore:"true"`
+ MsgContentsEsEs valueTypes.String `json:"msg_contents_es_es" PointIgnore:"true"`
+ MsgContentsFrFr valueTypes.String `json:"msg_contents_fr_fr" PointIgnore:"true"`
+ MsgContentsIDID valueTypes.String `json:"msg_contents_id_id" PointIgnore:"true"`
+ MsgContentsItIt valueTypes.String `json:"msg_contents_it_it" PointIgnore:"true"`
+ MsgContentsJaJp valueTypes.String `json:"msg_contents_ja_jp" PointIgnore:"true"`
+ MsgContentsKoKr valueTypes.String `json:"msg_contents_ko_kr" PointIgnore:"true"`
+ MsgContentsNlNl valueTypes.String `json:"msg_contents_nl_nl" PointIgnore:"true"`
+ MsgContentsPlPl valueTypes.String `json:"msg_contents_pl_pl" PointIgnore:"true"`
+ MsgContentsPtBr valueTypes.String `json:"msg_contents_pt_br" PointIgnore:"true"`
+ MsgContentsPtPt valueTypes.String `json:"msg_contents_pt_pt" PointIgnore:"true"`
+ MsgContentsTrTr valueTypes.String `json:"msg_contents_tr_tr" PointIgnore:"true"`
+ MsgContentsViVn valueTypes.String `json:"msg_contents_vi_vn" PointIgnore:"true"`
+ MsgContentsZhTw valueTypes.String `json:"msg_contents_zh_tw" PointIgnore:"true"`
+
+ MsgTitle valueTypes.String `json:"msg_title" PointIgnore:"true"`
+ MsgTitleDeDe valueTypes.String `json:"msg_title_de_de" PointIgnore:"true"`
+ MsgTitleEsEs valueTypes.String `json:"msg_title_es_es" PointIgnore:"true"`
+ MsgTitleFrFr valueTypes.String `json:"msg_title_fr_fr" PointIgnore:"true"`
+ MsgTitleIDID valueTypes.String `json:"msg_title_id_id" PointIgnore:"true"`
+ MsgTitleItIt valueTypes.String `json:"msg_title_it_it" PointIgnore:"true"`
+ MsgTitleJaJp valueTypes.String `json:"msg_title_ja_jp" PointIgnore:"true"`
+ MsgTitleKoKr valueTypes.String `json:"msg_title_ko_kr" PointIgnore:"true"`
+ MsgTitleNlNl valueTypes.String `json:"msg_title_nl_nl" PointIgnore:"true"`
+ MsgTitlePlPl valueTypes.String `json:"msg_title_pl_pl" PointIgnore:"true"`
+ MsgTitlePtBr valueTypes.String `json:"msg_title_pt_br" PointIgnore:"true"`
+ MsgTitlePtPt valueTypes.String `json:"msg_title_pt_pt" PointIgnore:"true"`
+ MsgTitleTrTr valueTypes.String `json:"msg_title_tr_tr" PointIgnore:"true"`
+ MsgTitleViVn valueTypes.String `json:"msg_title_vi_vn" PointIgnore:"true"`
+ MsgTitleZhTw valueTypes.String `json:"msg_title_zh_tw" PointIgnore:"true"`
}
func (e *ResultData) IsValid() error {
var err error
- // switch {
- // case e.Dummy == "":
- // break
- // default:
- // err = errors.New(fmt.Sprintf("unknown error '%s'", e.Dummy))
- // }
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSysMsg/struct.go b/iSolarCloud/AppService/getSysMsg/struct.go
index 5bea5bb96..e9fd92ed7 100644
--- a/iSolarCloud/AppService/getSysMsg/struct.go
+++ b/iSolarCloud/AppService/getSysMsg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSysOrgNewList/data.go b/iSolarCloud/AppService/getSysOrgNewList/data.go
index fc928137c..0bf0e4347 100644
--- a/iSolarCloud/AppService/getSysOrgNewList/data.go
+++ b/iSolarCloud/AppService/getSysOrgNewList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSysOrgNewList/struct.go b/iSolarCloud/AppService/getSysOrgNewList/struct.go
index 08362fe52..19f17dee0 100644
--- a/iSolarCloud/AppService/getSysOrgNewList/struct.go
+++ b/iSolarCloud/AppService/getSysOrgNewList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSysOrgNewOne/data.go b/iSolarCloud/AppService/getSysOrgNewOne/data.go
index 403290410..7c7764ba5 100644
--- a/iSolarCloud/AppService/getSysOrgNewOne/data.go
+++ b/iSolarCloud/AppService/getSysOrgNewOne/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSysOrgNewOne/struct.go b/iSolarCloud/AppService/getSysOrgNewOne/struct.go
index 8d4fe9837..24cafd608 100644
--- a/iSolarCloud/AppService/getSysOrgNewOne/struct.go
+++ b/iSolarCloud/AppService/getSysOrgNewOne/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getSysUserById/data.go b/iSolarCloud/AppService/getSysUserById/data.go
index 4792971bd..88d864098 100644
--- a/iSolarCloud/AppService/getSysUserById/data.go
+++ b/iSolarCloud/AppService/getSysUserById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getSysUserById/struct.go b/iSolarCloud/AppService/getSysUserById/struct.go
index 32070e702..682277add 100644
--- a/iSolarCloud/AppService/getSysUserById/struct.go
+++ b/iSolarCloud/AppService/getSysUserById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getTableDataSql/data.go b/iSolarCloud/AppService/getTableDataSql/data.go
index cc1d41123..a03f2295b 100644
--- a/iSolarCloud/AppService/getTableDataSql/data.go
+++ b/iSolarCloud/AppService/getTableDataSql/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getTableDataSql/struct.go b/iSolarCloud/AppService/getTableDataSql/struct.go
index 3f578f46f..ebb75f7e4 100644
--- a/iSolarCloud/AppService/getTableDataSql/struct.go
+++ b/iSolarCloud/AppService/getTableDataSql/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getTableDataSqlCount/data.go b/iSolarCloud/AppService/getTableDataSqlCount/data.go
index fd9908866..213712b95 100644
--- a/iSolarCloud/AppService/getTableDataSqlCount/data.go
+++ b/iSolarCloud/AppService/getTableDataSqlCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getTableDataSqlCount/struct.go b/iSolarCloud/AppService/getTableDataSqlCount/struct.go
index 3a7dd0bcd..2a42a4c03 100644
--- a/iSolarCloud/AppService/getTableDataSqlCount/struct.go
+++ b/iSolarCloud/AppService/getTableDataSqlCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getTemplateByInfoType/data.go b/iSolarCloud/AppService/getTemplateByInfoType/data.go
index 8d890c133..9cd5798fe 100644
--- a/iSolarCloud/AppService/getTemplateByInfoType/data.go
+++ b/iSolarCloud/AppService/getTemplateByInfoType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getTemplateByInfoType/struct.go b/iSolarCloud/AppService/getTemplateByInfoType/struct.go
index 5d506679a..50bf876df 100644
--- a/iSolarCloud/AppService/getTemplateByInfoType/struct.go
+++ b/iSolarCloud/AppService/getTemplateByInfoType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getTemplateList/data.go b/iSolarCloud/AppService/getTemplateList/data.go
index d159c540e..1dd1a5356 100644
--- a/iSolarCloud/AppService/getTemplateList/data.go
+++ b/iSolarCloud/AppService/getTemplateList/data.go
@@ -29,7 +29,7 @@ type ResultData struct {
TemplateId valueTypes.Integer `json:"template_id"`
TemplateName valueTypes.String `json:"template_name"`
UpdateTime valueTypes.DateTime `json:"update_time"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"TemplateId" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"TemplateId" PointIdReplace:"true" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
@@ -48,7 +48,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getTemplateList/struct.go b/iSolarCloud/AppService/getTemplateList/struct.go
index e38d43ae5..138e74812 100644
--- a/iSolarCloud/AppService/getTemplateList/struct.go
+++ b/iSolarCloud/AppService/getTemplateList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUUIDByUpuuid/data.go b/iSolarCloud/AppService/getUUIDByUpuuid/data.go
index 6585db694..d7c385c3f 100644
--- a/iSolarCloud/AppService/getUUIDByUpuuid/data.go
+++ b/iSolarCloud/AppService/getUUIDByUpuuid/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUUIDByUpuuid/struct.go b/iSolarCloud/AppService/getUUIDByUpuuid/struct.go
index 8e3a99891..a1dd3c716 100644
--- a/iSolarCloud/AppService/getUUIDByUpuuid/struct.go
+++ b/iSolarCloud/AppService/getUUIDByUpuuid/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUpTimePoint/data.go b/iSolarCloud/AppService/getUpTimePoint/data.go
index 76a487eb7..b3eb02271 100644
--- a/iSolarCloud/AppService/getUpTimePoint/data.go
+++ b/iSolarCloud/AppService/getUpTimePoint/data.go
@@ -70,7 +70,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUpTimePoint/struct.go b/iSolarCloud/AppService/getUpTimePoint/struct.go
index d19caab02..ad1ae3fda 100644
--- a/iSolarCloud/AppService/getUpTimePoint/struct.go
+++ b/iSolarCloud/AppService/getUpTimePoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserById/data.go b/iSolarCloud/AppService/getUserById/data.go
index 5f55733ed..399b522b8 100644
--- a/iSolarCloud/AppService/getUserById/data.go
+++ b/iSolarCloud/AppService/getUserById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserById/struct.go b/iSolarCloud/AppService/getUserById/struct.go
index 2e95d4919..3215981b0 100644
--- a/iSolarCloud/AppService/getUserById/struct.go
+++ b/iSolarCloud/AppService/getUserById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserByInstaller/data.go b/iSolarCloud/AppService/getUserByInstaller/data.go
index 8b76555db..eabeef563 100644
--- a/iSolarCloud/AppService/getUserByInstaller/data.go
+++ b/iSolarCloud/AppService/getUserByInstaller/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserByInstaller/struct.go b/iSolarCloud/AppService/getUserByInstaller/struct.go
index 4ab0f5a06..fb5063af9 100644
--- a/iSolarCloud/AppService/getUserByInstaller/struct.go
+++ b/iSolarCloud/AppService/getUserByInstaller/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go b/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go
index 01ea6fd40..a48f0c984 100644
--- a/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go
+++ b/iSolarCloud/AppService/getUserDevOnlineOffineCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go b/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go
index b9144562f..d5275d779 100644
--- a/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go
+++ b/iSolarCloud/AppService/getUserDevOnlineOffineCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserGDPRAttrs/data.go b/iSolarCloud/AppService/getUserGDPRAttrs/data.go
index 2159d6fd2..df3e5997f 100644
--- a/iSolarCloud/AppService/getUserGDPRAttrs/data.go
+++ b/iSolarCloud/AppService/getUserGDPRAttrs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserGDPRAttrs/struct.go b/iSolarCloud/AppService/getUserGDPRAttrs/struct.go
index 68dfed872..1ee809803 100644
--- a/iSolarCloud/AppService/getUserGDPRAttrs/struct.go
+++ b/iSolarCloud/AppService/getUserGDPRAttrs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserHavePowerStationCount/data.go b/iSolarCloud/AppService/getUserHavePowerStationCount/data.go
index 896ab25d1..b0f6f452a 100644
--- a/iSolarCloud/AppService/getUserHavePowerStationCount/data.go
+++ b/iSolarCloud/AppService/getUserHavePowerStationCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go b/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go
index 645587864..3172b3d66 100644
--- a/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go
+++ b/iSolarCloud/AppService/getUserHavePowerStationCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go b/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go
index 1e85e6a0c..954045a2d 100644
--- a/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go
+++ b/iSolarCloud/AppService/getUserInfoByUserAccounts/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go b/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go
index 5bd6df4c5..39444f689 100644
--- a/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go
+++ b/iSolarCloud/AppService/getUserInfoByUserAccounts/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserList/data.go b/iSolarCloud/AppService/getUserList/data.go
index e0918bd02..edf64d661 100644
--- a/iSolarCloud/AppService/getUserList/data.go
+++ b/iSolarCloud/AppService/getUserList/data.go
@@ -65,7 +65,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserList/struct.go b/iSolarCloud/AppService/getUserList/struct.go
index 32ce66a28..38b1fb67b 100644
--- a/iSolarCloud/AppService/getUserList/struct.go
+++ b/iSolarCloud/AppService/getUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getUserPsOrderList/data.go b/iSolarCloud/AppService/getUserPsOrderList/data.go
index b7d74a948..6b98ab5d9 100644
--- a/iSolarCloud/AppService/getUserPsOrderList/data.go
+++ b/iSolarCloud/AppService/getUserPsOrderList/data.go
@@ -26,7 +26,7 @@ func (rd RequestData) Help() string {
type ResultData struct {
CurPage valueTypes.Integer `json:"curPage" PointId:"cur_page"`
IsMore valueTypes.Bool `json:"isMore" PointId:"is_more"`
- PageList []interface{} `json:"pageList" PointId:"page_list" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PageList []interface{} `json:"pageList" PointId:"page_list" PointIdReplace:"true" PointArrayFlatten:"false"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
Size valueTypes.Integer `json:"size"`
StartIndex interface{} `json:"startIndex" PointId:"start_index"`
@@ -67,7 +67,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getUserPsOrderList/struct.go b/iSolarCloud/AppService/getUserPsOrderList/struct.go
index 5e6de533f..b67f5ec9f 100644
--- a/iSolarCloud/AppService/getUserPsOrderList/struct.go
+++ b/iSolarCloud/AppService/getUserPsOrderList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getValFromHBase/data.go b/iSolarCloud/AppService/getValFromHBase/data.go
index bc68ea9bf..f4fdb7018 100644
--- a/iSolarCloud/AppService/getValFromHBase/data.go
+++ b/iSolarCloud/AppService/getValFromHBase/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getValFromHBase/struct.go b/iSolarCloud/AppService/getValFromHBase/struct.go
index bc5452264..727d6c389 100644
--- a/iSolarCloud/AppService/getValFromHBase/struct.go
+++ b/iSolarCloud/AppService/getValFromHBase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getValidateCode/data.go b/iSolarCloud/AppService/getValidateCode/data.go
index f08c72cee..61d52da34 100644
--- a/iSolarCloud/AppService/getValidateCode/data.go
+++ b/iSolarCloud/AppService/getValidateCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getValidateCode/struct.go b/iSolarCloud/AppService/getValidateCode/struct.go
index f92087224..280b0e872 100644
--- a/iSolarCloud/AppService/getValidateCode/struct.go
+++ b/iSolarCloud/AppService/getValidateCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getValidateCodeAtRegister/data.go b/iSolarCloud/AppService/getValidateCodeAtRegister/data.go
index 80fa7aa0b..7945cb3ab 100644
--- a/iSolarCloud/AppService/getValidateCodeAtRegister/data.go
+++ b/iSolarCloud/AppService/getValidateCodeAtRegister/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go b/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go
index 0b644efde..8779d1a15 100644
--- a/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go
+++ b/iSolarCloud/AppService/getValidateCodeAtRegister/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getWeatherInfo/data.go b/iSolarCloud/AppService/getWeatherInfo/data.go
index c92eee455..3e6ae175a 100644
--- a/iSolarCloud/AppService/getWeatherInfo/data.go
+++ b/iSolarCloud/AppService/getWeatherInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getWeatherInfo/struct.go b/iSolarCloud/AppService/getWeatherInfo/struct.go
index f9df6664a..97eba9b4f 100644
--- a/iSolarCloud/AppService/getWeatherInfo/struct.go
+++ b/iSolarCloud/AppService/getWeatherInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getWechatPushConfig/data.go b/iSolarCloud/AppService/getWechatPushConfig/data.go
index 32da2f815..f9e8c3f57 100644
--- a/iSolarCloud/AppService/getWechatPushConfig/data.go
+++ b/iSolarCloud/AppService/getWechatPushConfig/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getWechatPushConfig/struct.go b/iSolarCloud/AppService/getWechatPushConfig/struct.go
index 04b95c99f..56e3b26fa 100644
--- a/iSolarCloud/AppService/getWechatPushConfig/struct.go
+++ b/iSolarCloud/AppService/getWechatPushConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/getWorkInfo/data.go b/iSolarCloud/AppService/getWorkInfo/data.go
index 3f683474f..b7044887f 100644
--- a/iSolarCloud/AppService/getWorkInfo/data.go
+++ b/iSolarCloud/AppService/getWorkInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/getWorkInfo/struct.go b/iSolarCloud/AppService/getWorkInfo/struct.go
index 80ae36436..b11afc046 100644
--- a/iSolarCloud/AppService/getWorkInfo/struct.go
+++ b/iSolarCloud/AppService/getWorkInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/groupStringCheck/data.go b/iSolarCloud/AppService/groupStringCheck/data.go
index 583db5c68..885f640cc 100644
--- a/iSolarCloud/AppService/groupStringCheck/data.go
+++ b/iSolarCloud/AppService/groupStringCheck/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/groupStringCheck/struct.go b/iSolarCloud/AppService/groupStringCheck/struct.go
index a96f0951e..d22773c8d 100644
--- a/iSolarCloud/AppService/groupStringCheck/struct.go
+++ b/iSolarCloud/AppService/groupStringCheck/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/handleDevByCommunicationSN/data.go b/iSolarCloud/AppService/handleDevByCommunicationSN/data.go
index 3b2d5a4d5..902808486 100644
--- a/iSolarCloud/AppService/handleDevByCommunicationSN/data.go
+++ b/iSolarCloud/AppService/handleDevByCommunicationSN/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go b/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go
index 144f461d1..9bf750ba5 100644
--- a/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go
+++ b/iSolarCloud/AppService/handleDevByCommunicationSN/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/householdResetPassBySN/data.go b/iSolarCloud/AppService/householdResetPassBySN/data.go
index d4035c1fa..8658aad57 100644
--- a/iSolarCloud/AppService/householdResetPassBySN/data.go
+++ b/iSolarCloud/AppService/householdResetPassBySN/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/householdResetPassBySN/struct.go b/iSolarCloud/AppService/householdResetPassBySN/struct.go
index 82a26fdb8..54988eeae 100644
--- a/iSolarCloud/AppService/householdResetPassBySN/struct.go
+++ b/iSolarCloud/AppService/householdResetPassBySN/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/immediatePayment/data.go b/iSolarCloud/AppService/immediatePayment/data.go
index d015e6b08..1348a1e3f 100644
--- a/iSolarCloud/AppService/immediatePayment/data.go
+++ b/iSolarCloud/AppService/immediatePayment/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/immediatePayment/struct.go b/iSolarCloud/AppService/immediatePayment/struct.go
index 1e5b849a4..b3577f21b 100644
--- a/iSolarCloud/AppService/immediatePayment/struct.go
+++ b/iSolarCloud/AppService/immediatePayment/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/importExcelData/data.go b/iSolarCloud/AppService/importExcelData/data.go
index 6872c88a2..38a32cf90 100644
--- a/iSolarCloud/AppService/importExcelData/data.go
+++ b/iSolarCloud/AppService/importExcelData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/importExcelData/struct.go b/iSolarCloud/AppService/importExcelData/struct.go
index 1b68af6d0..9b1ca38ab 100644
--- a/iSolarCloud/AppService/importExcelData/struct.go
+++ b/iSolarCloud/AppService/importExcelData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/incomeStatistics/data.go b/iSolarCloud/AppService/incomeStatistics/data.go
index 735535cb1..3e47c9618 100644
--- a/iSolarCloud/AppService/incomeStatistics/data.go
+++ b/iSolarCloud/AppService/incomeStatistics/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/incomeStatistics/struct.go b/iSolarCloud/AppService/incomeStatistics/struct.go
index b8aa7fc2e..2dcb20702 100644
--- a/iSolarCloud/AppService/incomeStatistics/struct.go
+++ b/iSolarCloud/AppService/incomeStatistics/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/informPush/data.go b/iSolarCloud/AppService/informPush/data.go
index ccff68791..545becb24 100644
--- a/iSolarCloud/AppService/informPush/data.go
+++ b/iSolarCloud/AppService/informPush/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/informPush/struct.go b/iSolarCloud/AppService/informPush/struct.go
index 6d91435a5..be4a22d2b 100644
--- a/iSolarCloud/AppService/informPush/struct.go
+++ b/iSolarCloud/AppService/informPush/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/insertEmgOrgInfo/data.go b/iSolarCloud/AppService/insertEmgOrgInfo/data.go
index 102c50255..54e7065cb 100644
--- a/iSolarCloud/AppService/insertEmgOrgInfo/data.go
+++ b/iSolarCloud/AppService/insertEmgOrgInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/insertEmgOrgInfo/struct.go b/iSolarCloud/AppService/insertEmgOrgInfo/struct.go
index 41f910763..8218cd70c 100644
--- a/iSolarCloud/AppService/insertEmgOrgInfo/struct.go
+++ b/iSolarCloud/AppService/insertEmgOrgInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go
index 331f7c033..cfb07dfc9 100644
--- a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go
+++ b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go
index d8bfe9543..ccdca9e6e 100644
--- a/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go
+++ b/iSolarCloud/AppService/insightSynDeviceStructure2Cloud/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/intoDataToHbase/data.go b/iSolarCloud/AppService/intoDataToHbase/data.go
index 28781537e..dbfa6843b 100644
--- a/iSolarCloud/AppService/intoDataToHbase/data.go
+++ b/iSolarCloud/AppService/intoDataToHbase/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/intoDataToHbase/struct.go b/iSolarCloud/AppService/intoDataToHbase/struct.go
index 321e3c60c..4424fe37b 100644
--- a/iSolarCloud/AppService/intoDataToHbase/struct.go
+++ b/iSolarCloud/AppService/intoDataToHbase/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/ipLocationQuery/data.go b/iSolarCloud/AppService/ipLocationQuery/data.go
index 169d6eb32..f7468375f 100644
--- a/iSolarCloud/AppService/ipLocationQuery/data.go
+++ b/iSolarCloud/AppService/ipLocationQuery/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/ipLocationQuery/struct.go b/iSolarCloud/AppService/ipLocationQuery/struct.go
index a2a310e7e..512559556 100644
--- a/iSolarCloud/AppService/ipLocationQuery/struct.go
+++ b/iSolarCloud/AppService/ipLocationQuery/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/isHave2GSn/data.go b/iSolarCloud/AppService/isHave2GSn/data.go
index 74206f497..6c230f525 100644
--- a/iSolarCloud/AppService/isHave2GSn/data.go
+++ b/iSolarCloud/AppService/isHave2GSn/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/isHave2GSn/struct.go b/iSolarCloud/AppService/isHave2GSn/struct.go
index c661f916c..9bb98ac70 100644
--- a/iSolarCloud/AppService/isHave2GSn/struct.go
+++ b/iSolarCloud/AppService/isHave2GSn/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go
index 3c7fc6010..1666ebee2 100644
--- a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go
+++ b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go
index 0932cd451..884c1e5cb 100644
--- a/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go
+++ b/iSolarCloud/AppService/judgeDevIsHasInitSetTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/judgeIsSettingMan/data.go b/iSolarCloud/AppService/judgeIsSettingMan/data.go
index 5bdde95a7..7abac23c0 100644
--- a/iSolarCloud/AppService/judgeIsSettingMan/data.go
+++ b/iSolarCloud/AppService/judgeIsSettingMan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/judgeIsSettingMan/struct.go b/iSolarCloud/AppService/judgeIsSettingMan/struct.go
index 29714a08a..f70d73d28 100644
--- a/iSolarCloud/AppService/judgeIsSettingMan/struct.go
+++ b/iSolarCloud/AppService/judgeIsSettingMan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/listOssFiles/data.go b/iSolarCloud/AppService/listOssFiles/data.go
index c32e9510e..edb964f92 100644
--- a/iSolarCloud/AppService/listOssFiles/data.go
+++ b/iSolarCloud/AppService/listOssFiles/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/listOssFiles/struct.go b/iSolarCloud/AppService/listOssFiles/struct.go
index 0780bcacd..c1a824b63 100644
--- a/iSolarCloud/AppService/listOssFiles/struct.go
+++ b/iSolarCloud/AppService/listOssFiles/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/loadAreaInfo/data.go b/iSolarCloud/AppService/loadAreaInfo/data.go
index c9c8b4986..70df87243 100644
--- a/iSolarCloud/AppService/loadAreaInfo/data.go
+++ b/iSolarCloud/AppService/loadAreaInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/loadAreaInfo/struct.go b/iSolarCloud/AppService/loadAreaInfo/struct.go
index 7d7bb0368..8215c310d 100644
--- a/iSolarCloud/AppService/loadAreaInfo/struct.go
+++ b/iSolarCloud/AppService/loadAreaInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/loadPowerStation/data.go b/iSolarCloud/AppService/loadPowerStation/data.go
index a7f9e92f2..b6e836f64 100644
--- a/iSolarCloud/AppService/loadPowerStation/data.go
+++ b/iSolarCloud/AppService/loadPowerStation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/loadPowerStation/struct.go b/iSolarCloud/AppService/loadPowerStation/struct.go
index b3e1c2a50..ed5e50057 100644
--- a/iSolarCloud/AppService/loadPowerStation/struct.go
+++ b/iSolarCloud/AppService/loadPowerStation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/login/data.go b/iSolarCloud/AppService/login/data.go
index 31f5718e8..1c2f1ada2 100644
--- a/iSolarCloud/AppService/login/data.go
+++ b/iSolarCloud/AppService/login/data.go
@@ -192,7 +192,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/login/struct.go b/iSolarCloud/AppService/login/struct.go
index 3cef9a90f..bcb4997d4 100644
--- a/iSolarCloud/AppService/login/struct.go
+++ b/iSolarCloud/AppService/login/struct.go
@@ -37,7 +37,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/loginByToken/data.go b/iSolarCloud/AppService/loginByToken/data.go
index faf9411ce..7983ac888 100644
--- a/iSolarCloud/AppService/loginByToken/data.go
+++ b/iSolarCloud/AppService/loginByToken/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/loginByToken/struct.go b/iSolarCloud/AppService/loginByToken/struct.go
index 3d8d918fb..ff0672b02 100644
--- a/iSolarCloud/AppService/loginByToken/struct.go
+++ b/iSolarCloud/AppService/loginByToken/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/logout/data.go b/iSolarCloud/AppService/logout/data.go
index ba8ed193c..fe406b6f1 100644
--- a/iSolarCloud/AppService/logout/data.go
+++ b/iSolarCloud/AppService/logout/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/logout/struct.go b/iSolarCloud/AppService/logout/struct.go
index df8966edd..0396ccef0 100644
--- a/iSolarCloud/AppService/logout/struct.go
+++ b/iSolarCloud/AppService/logout/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/mobilePhoneHasBound/data.go b/iSolarCloud/AppService/mobilePhoneHasBound/data.go
index 0bb520a4e..c90acb4e9 100644
--- a/iSolarCloud/AppService/mobilePhoneHasBound/data.go
+++ b/iSolarCloud/AppService/mobilePhoneHasBound/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/mobilePhoneHasBound/struct.go b/iSolarCloud/AppService/mobilePhoneHasBound/struct.go
index dff87ef10..995f44ede 100644
--- a/iSolarCloud/AppService/mobilePhoneHasBound/struct.go
+++ b/iSolarCloud/AppService/mobilePhoneHasBound/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifiedDeviceInfo/data.go b/iSolarCloud/AppService/modifiedDeviceInfo/data.go
index df842150e..02c8878f6 100644
--- a/iSolarCloud/AppService/modifiedDeviceInfo/data.go
+++ b/iSolarCloud/AppService/modifiedDeviceInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifiedDeviceInfo/struct.go b/iSolarCloud/AppService/modifiedDeviceInfo/struct.go
index b7e56ef5f..93c9da967 100644
--- a/iSolarCloud/AppService/modifiedDeviceInfo/struct.go
+++ b/iSolarCloud/AppService/modifiedDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyEmgOrgStruc/data.go b/iSolarCloud/AppService/modifyEmgOrgStruc/data.go
index 6d118a5aa..75a818231 100644
--- a/iSolarCloud/AppService/modifyEmgOrgStruc/data.go
+++ b/iSolarCloud/AppService/modifyEmgOrgStruc/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go b/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go
index eecd68e48..02885a707 100644
--- a/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go
+++ b/iSolarCloud/AppService/modifyEmgOrgStruc/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyFaultPlan/data.go b/iSolarCloud/AppService/modifyFaultPlan/data.go
index 49ecfa7a8..a3170bb84 100644
--- a/iSolarCloud/AppService/modifyFaultPlan/data.go
+++ b/iSolarCloud/AppService/modifyFaultPlan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyFaultPlan/struct.go b/iSolarCloud/AppService/modifyFaultPlan/struct.go
index b2299f061..1508f9a43 100644
--- a/iSolarCloud/AppService/modifyFaultPlan/struct.go
+++ b/iSolarCloud/AppService/modifyFaultPlan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyOnDutyInfo/data.go b/iSolarCloud/AppService/modifyOnDutyInfo/data.go
index f8434878d..542ba6319 100644
--- a/iSolarCloud/AppService/modifyOnDutyInfo/data.go
+++ b/iSolarCloud/AppService/modifyOnDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyOnDutyInfo/struct.go b/iSolarCloud/AppService/modifyOnDutyInfo/struct.go
index d86bd4be2..35e39f501 100644
--- a/iSolarCloud/AppService/modifyOnDutyInfo/struct.go
+++ b/iSolarCloud/AppService/modifyOnDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyPassword/data.go b/iSolarCloud/AppService/modifyPassword/data.go
index 2580f31a6..115575397 100644
--- a/iSolarCloud/AppService/modifyPassword/data.go
+++ b/iSolarCloud/AppService/modifyPassword/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyPassword/struct.go b/iSolarCloud/AppService/modifyPassword/struct.go
index 28ec7e0b0..08ef64e0d 100644
--- a/iSolarCloud/AppService/modifyPassword/struct.go
+++ b/iSolarCloud/AppService/modifyPassword/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyPersonalUnitList/data.go b/iSolarCloud/AppService/modifyPersonalUnitList/data.go
index 511d3ee1e..55e76c968 100644
--- a/iSolarCloud/AppService/modifyPersonalUnitList/data.go
+++ b/iSolarCloud/AppService/modifyPersonalUnitList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyPersonalUnitList/struct.go b/iSolarCloud/AppService/modifyPersonalUnitList/struct.go
index ca9328868..66ccb8f15 100644
--- a/iSolarCloud/AppService/modifyPersonalUnitList/struct.go
+++ b/iSolarCloud/AppService/modifyPersonalUnitList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/modifyPsUser/data.go b/iSolarCloud/AppService/modifyPsUser/data.go
index 4739328ec..38f013751 100644
--- a/iSolarCloud/AppService/modifyPsUser/data.go
+++ b/iSolarCloud/AppService/modifyPsUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/modifyPsUser/struct.go b/iSolarCloud/AppService/modifyPsUser/struct.go
index d411e0c31..042377d4b 100644
--- a/iSolarCloud/AppService/modifyPsUser/struct.go
+++ b/iSolarCloud/AppService/modifyPsUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/moduleLogParamSet/data.go b/iSolarCloud/AppService/moduleLogParamSet/data.go
index ee6b064c0..61a94856a 100644
--- a/iSolarCloud/AppService/moduleLogParamSet/data.go
+++ b/iSolarCloud/AppService/moduleLogParamSet/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/moduleLogParamSet/struct.go b/iSolarCloud/AppService/moduleLogParamSet/struct.go
index c0cc9cdba..f33d5fc6a 100644
--- a/iSolarCloud/AppService/moduleLogParamSet/struct.go
+++ b/iSolarCloud/AppService/moduleLogParamSet/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/operateOssFile/data.go b/iSolarCloud/AppService/operateOssFile/data.go
index 3edf0a008..d944d3b74 100644
--- a/iSolarCloud/AppService/operateOssFile/data.go
+++ b/iSolarCloud/AppService/operateOssFile/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/operateOssFile/struct.go b/iSolarCloud/AppService/operateOssFile/struct.go
index 737be14f0..ee1b76313 100644
--- a/iSolarCloud/AppService/operateOssFile/struct.go
+++ b/iSolarCloud/AppService/operateOssFile/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go
index 6276fc328..779c3473f 100644
--- a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go
+++ b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go
index 7cddec937..d09aa532b 100644
--- a/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go
+++ b/iSolarCloud/AppService/operationPowerRobotSweepStrategy/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/orgPowerReport/data.go b/iSolarCloud/AppService/orgPowerReport/data.go
index 5f9742b05..7cff63b3f 100644
--- a/iSolarCloud/AppService/orgPowerReport/data.go
+++ b/iSolarCloud/AppService/orgPowerReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/orgPowerReport/struct.go b/iSolarCloud/AppService/orgPowerReport/struct.go
index 83ddaaa3c..ebbc5a015 100644
--- a/iSolarCloud/AppService/orgPowerReport/struct.go
+++ b/iSolarCloud/AppService/orgPowerReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/paramSetTryAgain/data.go b/iSolarCloud/AppService/paramSetTryAgain/data.go
index 46773ac98..aa6b93926 100644
--- a/iSolarCloud/AppService/paramSetTryAgain/data.go
+++ b/iSolarCloud/AppService/paramSetTryAgain/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/paramSetTryAgain/struct.go b/iSolarCloud/AppService/paramSetTryAgain/struct.go
index 96b9f9a6b..d16d35c08 100644
--- a/iSolarCloud/AppService/paramSetTryAgain/struct.go
+++ b/iSolarCloud/AppService/paramSetTryAgain/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/paramSetting/data.go b/iSolarCloud/AppService/paramSetting/data.go
index 6e30cab57..3ec309191 100644
--- a/iSolarCloud/AppService/paramSetting/data.go
+++ b/iSolarCloud/AppService/paramSetting/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/paramSetting/struct.go b/iSolarCloud/AppService/paramSetting/struct.go
index 6ad61f3f3..6741bcdd0 100644
--- a/iSolarCloud/AppService/paramSetting/struct.go
+++ b/iSolarCloud/AppService/paramSetting/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/planPower/data.go b/iSolarCloud/AppService/planPower/data.go
index d93190b6b..7bc2fb625 100644
--- a/iSolarCloud/AppService/planPower/data.go
+++ b/iSolarCloud/AppService/planPower/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/planPower/struct.go b/iSolarCloud/AppService/planPower/struct.go
index 6a71256a6..3d8df24d3 100644
--- a/iSolarCloud/AppService/planPower/struct.go
+++ b/iSolarCloud/AppService/planPower/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/powerDevicePointList/data.go b/iSolarCloud/AppService/powerDevicePointList/data.go
index d4bef8735..9521716a0 100644
--- a/iSolarCloud/AppService/powerDevicePointList/data.go
+++ b/iSolarCloud/AppService/powerDevicePointList/data.go
@@ -58,7 +58,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/powerDevicePointList/struct.go b/iSolarCloud/AppService/powerDevicePointList/struct.go
index 7f152509f..2b2beb87c 100644
--- a/iSolarCloud/AppService/powerDevicePointList/struct.go
+++ b/iSolarCloud/AppService/powerDevicePointList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/powerTrendChartData/data.go b/iSolarCloud/AppService/powerTrendChartData/data.go
index 199c5cfeb..e52e977b1 100644
--- a/iSolarCloud/AppService/powerTrendChartData/data.go
+++ b/iSolarCloud/AppService/powerTrendChartData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/powerTrendChartData/struct.go b/iSolarCloud/AppService/powerTrendChartData/struct.go
index 1f3739181..f821ac28b 100644
--- a/iSolarCloud/AppService/powerTrendChartData/struct.go
+++ b/iSolarCloud/AppService/powerTrendChartData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/psForcastInfo/data.go b/iSolarCloud/AppService/psForcastInfo/data.go
index 40ede20b7..3a7b6dc0c 100644
--- a/iSolarCloud/AppService/psForcastInfo/data.go
+++ b/iSolarCloud/AppService/psForcastInfo/data.go
@@ -54,7 +54,7 @@ type ResultData struct {
Visibility valueTypes.Float `json:"visibility"`
WeatherDesc valueTypes.String `json:"weather_desc"`
WeatherURL valueTypes.String `json:"weather_url"`
- } `json:"areaForcastList" PointNameFromChild:"DateTime" PointNameDateFormat:"20060102" DataTable:"true"`
+ } `json:"areaForcastList" PointIdFromChild:"DateTime" PointNameDateFormat:"20060102" DataTable:"true"`
StationsCityCode []struct {
City valueTypes.String `json:"city"`
PsId valueTypes.PsId `json:"ps_id"`
diff --git a/iSolarCloud/AppService/psForcastInfo/struct.go b/iSolarCloud/AppService/psForcastInfo/struct.go
index 8325f780c..cfaa10611 100644
--- a/iSolarCloud/AppService/psForcastInfo/struct.go
+++ b/iSolarCloud/AppService/psForcastInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/psHourPointsValue/struct.go b/iSolarCloud/AppService/psHourPointsValue/struct.go
index ae44efbf3..54d45a808 100644
--- a/iSolarCloud/AppService/psHourPointsValue/struct.go
+++ b/iSolarCloud/AppService/psHourPointsValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryAllPsIdAndName/data.go b/iSolarCloud/AppService/queryAllPsIdAndName/data.go
index a9ffa9446..0030eb036 100644
--- a/iSolarCloud/AppService/queryAllPsIdAndName/data.go
+++ b/iSolarCloud/AppService/queryAllPsIdAndName/data.go
@@ -27,7 +27,7 @@ type ResultData struct {
PageList []struct {
PsId valueTypes.PsId `json:"ps_id"`
PsName valueTypes.String `json:"ps_name"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsId" PointNameAppend:"false" PointNameAppend:"false" DataTable:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsId" PointIdReplace:"true" DataTable:"true"`
}
func (e *ResultData) IsValid() error {
@@ -48,7 +48,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryAllPsIdAndName/struct.go b/iSolarCloud/AppService/queryAllPsIdAndName/struct.go
index 908c579cd..e281fd17e 100644
--- a/iSolarCloud/AppService/queryAllPsIdAndName/struct.go
+++ b/iSolarCloud/AppService/queryAllPsIdAndName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go b/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go
index 4caa8cb0b..d051a68b1 100644
--- a/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go
+++ b/iSolarCloud/AppService/queryBatchCreatePsTaskList/data.go
@@ -60,7 +60,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go b/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go
index acb57af7a..da6667cd6 100644
--- a/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go
+++ b/iSolarCloud/AppService/queryBatchCreatePsTaskList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go
index 00adc3d17..7cde0c361 100644
--- a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go
+++ b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go
index a6d3c5d63..a5d7f6ce8 100644
--- a/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go
+++ b/iSolarCloud/AppService/queryBatchSpeedyAddPowerStationResult/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCardStatusCTCC/data.go b/iSolarCloud/AppService/queryCardStatusCTCC/data.go
index ea395f1d4..8c292458e 100644
--- a/iSolarCloud/AppService/queryCardStatusCTCC/data.go
+++ b/iSolarCloud/AppService/queryCardStatusCTCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCardStatusCTCC/struct.go b/iSolarCloud/AppService/queryCardStatusCTCC/struct.go
index feb197f5b..051900f3a 100644
--- a/iSolarCloud/AppService/queryCardStatusCTCC/struct.go
+++ b/iSolarCloud/AppService/queryCardStatusCTCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryChildAccountList/data.go b/iSolarCloud/AppService/queryChildAccountList/data.go
index bd6f59c95..da3833dc4 100644
--- a/iSolarCloud/AppService/queryChildAccountList/data.go
+++ b/iSolarCloud/AppService/queryChildAccountList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryChildAccountList/struct.go b/iSolarCloud/AppService/queryChildAccountList/struct.go
index 95ad07842..9332d4e60 100644
--- a/iSolarCloud/AppService/queryChildAccountList/struct.go
+++ b/iSolarCloud/AppService/queryChildAccountList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCompensationRecordData/data.go b/iSolarCloud/AppService/queryCompensationRecordData/data.go
index d65d7a5ac..9bdc26c28 100644
--- a/iSolarCloud/AppService/queryCompensationRecordData/data.go
+++ b/iSolarCloud/AppService/queryCompensationRecordData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCompensationRecordData/struct.go b/iSolarCloud/AppService/queryCompensationRecordData/struct.go
index 9021e7d9b..a1c5cf414 100644
--- a/iSolarCloud/AppService/queryCompensationRecordData/struct.go
+++ b/iSolarCloud/AppService/queryCompensationRecordData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCompensationRecordList/data.go b/iSolarCloud/AppService/queryCompensationRecordList/data.go
index 32790fd31..1735d40d7 100644
--- a/iSolarCloud/AppService/queryCompensationRecordList/data.go
+++ b/iSolarCloud/AppService/queryCompensationRecordList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCompensationRecordList/struct.go b/iSolarCloud/AppService/queryCompensationRecordList/struct.go
index d4c49a1c1..f89d92c34 100644
--- a/iSolarCloud/AppService/queryCompensationRecordList/struct.go
+++ b/iSolarCloud/AppService/queryCompensationRecordList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryComponent/data.go b/iSolarCloud/AppService/queryComponent/data.go
index ac240c4ca..e378b117f 100644
--- a/iSolarCloud/AppService/queryComponent/data.go
+++ b/iSolarCloud/AppService/queryComponent/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryComponent/struct.go b/iSolarCloud/AppService/queryComponent/struct.go
index 6c2a7a329..27c7e8ba9 100644
--- a/iSolarCloud/AppService/queryComponent/struct.go
+++ b/iSolarCloud/AppService/queryComponent/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryComponentTechnicalParam/data.go b/iSolarCloud/AppService/queryComponentTechnicalParam/data.go
index 686faa812..60df7ae07 100644
--- a/iSolarCloud/AppService/queryComponentTechnicalParam/data.go
+++ b/iSolarCloud/AppService/queryComponentTechnicalParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go b/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go
index ccb887a56..a744111fb 100644
--- a/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go
+++ b/iSolarCloud/AppService/queryComponentTechnicalParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCountryGridAndRelation/data.go b/iSolarCloud/AppService/queryCountryGridAndRelation/data.go
index 62274fe6d..6c51e1808 100644
--- a/iSolarCloud/AppService/queryCountryGridAndRelation/data.go
+++ b/iSolarCloud/AppService/queryCountryGridAndRelation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go b/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go
index ff9a918fc..7b256830b 100644
--- a/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go
+++ b/iSolarCloud/AppService/queryCountryGridAndRelation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCountryList/data.go b/iSolarCloud/AppService/queryCountryList/data.go
index a94dfa18e..794690515 100644
--- a/iSolarCloud/AppService/queryCountryList/data.go
+++ b/iSolarCloud/AppService/queryCountryList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCountryList/struct.go b/iSolarCloud/AppService/queryCountryList/struct.go
index 0c05fbb9b..4bc9f23e7 100644
--- a/iSolarCloud/AppService/queryCountryList/struct.go
+++ b/iSolarCloud/AppService/queryCountryList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryCtrlTaskById/data.go b/iSolarCloud/AppService/queryCtrlTaskById/data.go
index 298437803..92d66d033 100644
--- a/iSolarCloud/AppService/queryCtrlTaskById/data.go
+++ b/iSolarCloud/AppService/queryCtrlTaskById/data.go
@@ -56,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryCtrlTaskById/struct.go b/iSolarCloud/AppService/queryCtrlTaskById/struct.go
index 9ab313a76..4b9587ee3 100644
--- a/iSolarCloud/AppService/queryCtrlTaskById/struct.go
+++ b/iSolarCloud/AppService/queryCtrlTaskById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceInfo/data.go b/iSolarCloud/AppService/queryDeviceInfo/data.go
index 14142a82f..7683302e2 100644
--- a/iSolarCloud/AppService/queryDeviceInfo/data.go
+++ b/iSolarCloud/AppService/queryDeviceInfo/data.go
@@ -30,7 +30,7 @@ type ResultData struct {
DeviceModel valueTypes.String `json:"device_model"`
DeviceModelCode valueTypes.String `json:"device_model_code"`
ModelId valueTypes.Integer `json:"model_id"`
- } `json:"deviceModelList" PointId:"device_model_list" PointNameFromChild:"ModelId" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"deviceModelList" PointId:"device_model_list" PointIdFromChild:"ModelId" PointArrayFlatten:"false" DataTable:"true"`
DevicePropertyValueList []struct {
DeviceType valueTypes.Integer `json:"device_type"`
PropertyCode valueTypes.Integer `json:"property_code"`
diff --git a/iSolarCloud/AppService/queryDeviceInfo/struct.go b/iSolarCloud/AppService/queryDeviceInfo/struct.go
index fcaaeffe7..6c4c537be 100644
--- a/iSolarCloud/AppService/queryDeviceInfo/struct.go
+++ b/iSolarCloud/AppService/queryDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
index 8f01231f5..39e7c65ec 100644
--- a/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
+++ b/iSolarCloud/AppService/queryDeviceInfoForApp/data.go
@@ -30,7 +30,7 @@ type ResultData struct {
DeviceModel valueTypes.String `json:"device_model"`
DeviceModelCode valueTypes.String `json:"device_model_code"`
ModelId valueTypes.Integer `json:"model_id"`
- } `json:"deviceModelList" PointId:"device_model_list" PointNameFromChild:"ModelId" PointArrayFlatten:"false" DataTable:"true"`
+ } `json:"deviceModelList" PointId:"device_model_list" PointIdFromChild:"ModelId" PointArrayFlatten:"false" DataTable:"true"`
DevicePropertyValueList []struct {
DeviceType valueTypes.Integer `json:"device_type"`
PropertyCode valueTypes.Integer `json:"property_code"`
diff --git a/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go b/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go
index da07047b0..a659eb955 100644
--- a/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go
+++ b/iSolarCloud/AppService/queryDeviceInfoForApp/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceList/data.go b/iSolarCloud/AppService/queryDeviceList/data.go
index c80f027dd..cb5d7e9f1 100644
--- a/iSolarCloud/AppService/queryDeviceList/data.go
+++ b/iSolarCloud/AppService/queryDeviceList/data.go
@@ -27,76 +27,22 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- DevCountByStatusMap struct {
- FaultCount valueTypes.Count `json:"fault_count" PointId:"fault_count" PointUpdateFreq:"UpdateFreqTotal"`
- OfflineCount valueTypes.Count `json:"offline_count" PointId:"offline_count" PointUpdateFreq:"UpdateFreqTotal"`
- RunCount valueTypes.Count `json:"run_count" PointId:"run_count" PointUpdateFreq:"UpdateFreqTotal"`
- WarningCount valueTypes.Count `json:"warning_count" PointId:"warning_count" PointUpdateFreq:"UpdateFreqTotal"`
- } `json:"dev_count_by_status_map" PointId:"device_status_count" DataTable:"true"`
- DevCountByTypeMap map[string]valueTypes.Integer `json:"dev_count_by_type_map" PointId:"device_type_count" PointUpdateFreq:"UpdateFreqBoot" DataTable:"true"`
- // DevCountByTypeMap struct {
- // One4 valueTypes.Integer `json:"14"`
- // Two2 valueTypes.Integer `json:"22"`
- // } `json:"dev_count_by_type_map"`
- DevTypeDefinition map[string]valueTypes.String `json:"dev_type_definition" PointId:"device_types" PointUpdateFreq:"UpdateFreqBoot" DataTable:"true"`
- // DevTypeDefinition struct {
- // One valueTypes.String `json:"1"`
- // One0 valueTypes.String `json:"10"`
- // One1 valueTypes.String `json:"11"`
- // One2 valueTypes.String `json:"12"`
- // One3 valueTypes.String `json:"13"`
- // One4 valueTypes.String `json:"14"`
- // One5 valueTypes.String `json:"15"`
- // One6 valueTypes.String `json:"16"`
- // One7 valueTypes.String `json:"17"`
- // One8 valueTypes.String `json:"18"`
- // One9 valueTypes.String `json:"19"`
- // Two0 valueTypes.String `json:"20"`
- // Two1 valueTypes.String `json:"21"`
- // Two2 valueTypes.String `json:"22"`
- // Two3 valueTypes.String `json:"23"`
- // Two4 valueTypes.String `json:"24"`
- // Two5 valueTypes.String `json:"25"`
- // Two6 valueTypes.String `json:"26"`
- // Two8 valueTypes.String `json:"28"`
- // Two9 valueTypes.String `json:"29"`
- // Three valueTypes.String `json:"3"`
- // Three0 valueTypes.String `json:"30"`
- // Three1 valueTypes.String `json:"31"`
- // Three2 valueTypes.String `json:"32"`
- // Three3 valueTypes.String `json:"33"`
- // Three4 valueTypes.String `json:"34"`
- // Three5 valueTypes.String `json:"35"`
- // Three6 valueTypes.String `json:"36"`
- // Three7 valueTypes.String `json:"37"`
- // Three8 valueTypes.String `json:"38"`
- // Three9 valueTypes.String `json:"39"`
- // Four valueTypes.String `json:"4"`
- // Four0 valueTypes.String `json:"40"`
- // Four1 valueTypes.String `json:"41"`
- // Four2 valueTypes.String `json:"42"`
- // Four3 valueTypes.String `json:"43"`
- // Four4 valueTypes.String `json:"44"`
- // Four5 valueTypes.String `json:"45"`
- // Four6 valueTypes.String `json:"46"`
- // Four7 valueTypes.String `json:"47"`
- // Four8 valueTypes.String `json:"48"`
- // Five valueTypes.String `json:"5"`
- // Five0 valueTypes.String `json:"50"`
- // Six valueTypes.String `json:"6"`
- // Seven valueTypes.String `json:"7"`
- // Eight valueTypes.String `json:"8"`
- // Nine valueTypes.String `json:"9"`
- // Nine9 valueTypes.String `json:"99"`
- // } `json:"dev_type_definition"`
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"-" PointDeviceFrom:"PsKey"`
+
+ PointData []PointStruct `json:"point_data" PointIdFromChild:"PointId" PointIdReplace:"true" DataTable:"true"`
+ PsTimezoneInfo struct {
+ IsDst valueTypes.Bool `json:"is_dst" PointUpdateFreq:"UpdateFreqInstant"`
+ TimeZone valueTypes.String `json:"time_zone" PointUpdateFreq:"UpdateFreqInstant"`
+ } `json:"psTimezoneInfo"`
+
AlarmCount valueTypes.Count `json:"alarm_count" PointId:"alarm_count" PointUpdateFreq:"UpdateFreqTotal"`
ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id" PointUpdateFreq:"UpdateFreqBoot"`
CommandStatus valueTypes.Integer `json:"command_status" PointId:"command_status" PointUpdateFreq:"UpdateFreqInstant"`
ComponentAmount valueTypes.Integer `json:"component_amount" PointId:"component_amount"`
DataFlag valueTypes.Integer `json:"data_flag" PointId:"data_flag" PointUpdateFreq:"UpdateFreqBoot"`
DataFlagDetail valueTypes.Integer `json:"data_flag_detail" PointId:"data_flag_detail"`
- DeviceArea valueTypes.Integer `json:"device_area" PointId:"device_area" PointUpdateFreq:"UpdateFreqBoot"` // References UUID and referenced by UUIDIndexCode
+ DeviceArea valueTypes.Integer `json:"device_area" PointId:"device_area" PointUpdateFreq:"UpdateFreqBoot"` // References UUID and referenced by UUIDIndexCode
DeviceAreaName valueTypes.String `json:"device_area_name" PointId:"device_area_name" PointUpdateFreq:"UpdateFreqBoot"`
DeviceCode valueTypes.Integer `json:"device_code" PointId:"device_code" PointUpdateFreq:"UpdateFreqBoot"`
DeviceId valueTypes.Integer `json:"device_id" PointId:"device_id" PointUpdateFreq:"UpdateFreqBoot"`
@@ -121,32 +67,93 @@ type ResultData struct {
OwnerAlarmCount valueTypes.Count `json:"owner_alarm_count" PointId:"owner_alarm_count" PointUpdateFreq:"UpdateFreqTotal"`
OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status" PointId:"owner_dev_fault_status" PointUpdateFreq:"UpdateFreqInstant"`
OwnerFaultCount valueTypes.Count `json:"owner_fault_count" PointId:"owner_fault_count" PointUpdateFreq:"UpdateFreqTotal"`
- PointData []PointStruct `json:"point_data" PointNameFromChild:"PointId" PointNameAppend:"false" DataTable:"true"`
Points interface{} `json:"points" PointId:"points"`
- PsTimezoneInfo struct {
- IsDst valueTypes.Bool `json:"is_dst" PointUpdateFreq:"UpdateFreqInstant"`
- TimeZone valueTypes.String `json:"time_zone" PointUpdateFreq:"UpdateFreqInstant"`
- } `json:"psTimezoneInfo"`
- PsId valueTypes.PsId `json:"ps_id" PointId:"ps_id" PointUpdateFreq:"UpdateFreqBoot"`
- PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"`
- RelState valueTypes.Integer `json:"rel_state" PointId:"rel_state" PointUpdateFreq:"UpdateFreqInstant"`
- Sn valueTypes.String `json:"sn" PointId:"sn" PointName:"Serial Number" PointUpdateFreq:"UpdateFreqBoot"`
- StringAmount valueTypes.Integer `json:"string_amount" PointId:"string_amount"`
- TypeName valueTypes.String `json:"type_name" PointId:"type_name" PointUpdateFreq:"UpdateFreqBoot"`
- UnitName valueTypes.String `json:"unit_name" PointId:"unit_name" PointUpdateFreq:"UpdateFreqBoot"`
- UUID valueTypes.Integer `json:"uuid" PointId:"uuid" PointUpdateFreq:"UpdateFreqBoot"` // Referenced by DeviceArea
- UUIDIndexCode valueTypes.String `json:"uuid_index_code" PointId:"uuid_index_code" PointUpdateFreq:"UpdateFreqBoot"` // Referenced by DeviceArea
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsKey" PointNameAppend:"false" PointArrayFlatten:"false"`
+ PsId valueTypes.PsId `json:"ps_id" PointId:"ps_id" PointUpdateFreq:"UpdateFreqBoot"`
+ PsKey valueTypes.PsKey `json:"ps_key" PointId:"ps_key" PointUpdateFreq:"UpdateFreqBoot"`
+ RelState valueTypes.Integer `json:"rel_state" PointId:"rel_state" PointUpdateFreq:"UpdateFreqInstant"`
+ Sn valueTypes.String `json:"sn" PointId:"sn" PointName:"Serial Number" PointUpdateFreq:"UpdateFreqBoot"`
+ StringAmount valueTypes.Integer `json:"string_amount" PointId:"string_amount"`
+ TypeName valueTypes.String `json:"type_name" PointId:"type_name" PointUpdateFreq:"UpdateFreqBoot"`
+ UnitName valueTypes.String `json:"unit_name" PointId:"unit_name" PointUpdateFreq:"UpdateFreqBoot"`
+ UUID valueTypes.Integer `json:"uuid" PointId:"uuid" PointUpdateFreq:"UpdateFreqBoot"` // Referenced by DeviceArea
+ UUIDIndexCode valueTypes.String `json:"uuid_index_code" PointId:"uuid_index_code" PointUpdateFreq:"UpdateFreqBoot"` // Referenced by DeviceArea
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsKey" PointIdReplace:"true"`
+
+ DevCountByStatusMap struct {
+ FaultCount valueTypes.Count `json:"fault_count" PointId:"fault_count" PointUpdateFreq:"UpdateFreqTotal"`
+ OfflineCount valueTypes.Count `json:"offline_count" PointId:"offline_count" PointUpdateFreq:"UpdateFreqTotal"`
+ RunCount valueTypes.Count `json:"run_count" PointId:"run_count" PointUpdateFreq:"UpdateFreqTotal"`
+ WarningCount valueTypes.Count `json:"warning_count" PointId:"warning_count" PointUpdateFreq:"UpdateFreqTotal"`
+ } `json:"dev_count_by_status_map" PointId:"device_status_count"`
+ DevCountByTypeMap map[string]valueTypes.Integer `json:"dev_count_by_type_map" PointId:"device_type_count" PointUpdateFreq:"UpdateFreqBoot"`
+ DevTypeDefinition map[string]valueTypes.String `json:"dev_type_definition" PointId:"device_types" PointUpdateFreq:"UpdateFreqBoot" DataTable:"true"`
RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count" PointIgnore:"true"`
}
+// DevCountByTypeMap struct {
+// One4 valueTypes.Integer `json:"14"`
+// Two2 valueTypes.Integer `json:"22"`
+// } `json:"dev_count_by_type_map"`
+// DevTypeDefinition struct {
+// One valueTypes.String `json:"1"`
+// One0 valueTypes.String `json:"10"`
+// One1 valueTypes.String `json:"11"`
+// One2 valueTypes.String `json:"12"`
+// One3 valueTypes.String `json:"13"`
+// One4 valueTypes.String `json:"14"`
+// One5 valueTypes.String `json:"15"`
+// One6 valueTypes.String `json:"16"`
+// One7 valueTypes.String `json:"17"`
+// One8 valueTypes.String `json:"18"`
+// One9 valueTypes.String `json:"19"`
+// Two0 valueTypes.String `json:"20"`
+// Two1 valueTypes.String `json:"21"`
+// Two2 valueTypes.String `json:"22"`
+// Two3 valueTypes.String `json:"23"`
+// Two4 valueTypes.String `json:"24"`
+// Two5 valueTypes.String `json:"25"`
+// Two6 valueTypes.String `json:"26"`
+// Two8 valueTypes.String `json:"28"`
+// Two9 valueTypes.String `json:"29"`
+// Three valueTypes.String `json:"3"`
+// Three0 valueTypes.String `json:"30"`
+// Three1 valueTypes.String `json:"31"`
+// Three2 valueTypes.String `json:"32"`
+// Three3 valueTypes.String `json:"33"`
+// Three4 valueTypes.String `json:"34"`
+// Three5 valueTypes.String `json:"35"`
+// Three6 valueTypes.String `json:"36"`
+// Three7 valueTypes.String `json:"37"`
+// Three8 valueTypes.String `json:"38"`
+// Three9 valueTypes.String `json:"39"`
+// Four valueTypes.String `json:"4"`
+// Four0 valueTypes.String `json:"40"`
+// Four1 valueTypes.String `json:"41"`
+// Four2 valueTypes.String `json:"42"`
+// Four3 valueTypes.String `json:"43"`
+// Four4 valueTypes.String `json:"44"`
+// Four5 valueTypes.String `json:"45"`
+// Four6 valueTypes.String `json:"46"`
+// Four7 valueTypes.String `json:"47"`
+// Four8 valueTypes.String `json:"48"`
+// Five valueTypes.String `json:"5"`
+// Five0 valueTypes.String `json:"50"`
+// Six valueTypes.String `json:"6"`
+// Seven valueTypes.String `json:"7"`
+// Eight valueTypes.String `json:"8"`
+// Nine valueTypes.String `json:"9"`
+// Nine9 valueTypes.String `json:"99"`
+// } `json:"dev_type_definition"`
type PointStruct struct {
+ GoStruct GoStruct.GoStruct `json:"GoStruct" PointDeviceFromParent:"PsKey"`
+
PointId valueTypes.PointId `json:"point_id" PointIgnore:"true" PointUpdateFreq:"UpdateFreqBoot"`
PointGroupName valueTypes.String `json:"point_group_name" PointIgnore:"true" PointUpdateFreq:"UpdateFreqBoot"`
PointName valueTypes.String `json:"point_name" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
TimeStamp valueTypes.DateTime `json:"time_stamp" PointIgnore:"true" PointUpdateFreq:"UpdateFreq5Mins"`
Value valueTypes.Float `json:"value" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUnitFrom:"Unit" PointUpdateFreq:"UpdateFreq5Mins"`
Unit valueTypes.String `json:"unit" PointIgnore:"true" PointUpdateFreq:"UpdateFreqBoot"`
+ PointSign valueTypes.String `json:"point_sign" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
ValueDescription valueTypes.String `json:"value_description" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
CodeId valueTypes.Integer `json:"code_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
@@ -159,7 +166,6 @@ type PointStruct struct {
OrderNum valueTypes.Integer `json:"order_num" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
PointGroupId valueTypes.Integer `json:"point_group_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
PointGroupIdOrderId valueTypes.Integer `json:"point_group_id_order_id" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
- PointSign valueTypes.String `json:"point_sign" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
Relate valueTypes.Integer `json:"relate" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
ValIsFixed valueTypes.Bool `json:"val_is_fixd" PointId:"value_is_fixed" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
ValidSize valueTypes.Integer `json:"valid_size" PointGroupNameFrom:"PointGroupName" PointTimestampFrom:"TimeStamp" PointUpdateFreq:"UpdateFreqBoot"`
@@ -192,6 +198,13 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
+ entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
+ // entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
+
+ if len(entries.Map) == 0 {
+ break
+ }
+
// // Used for virtual entries.
// // 0 - sungrow_battery_charging_power
// var PVPowerToBattery VirtualPointStruct
@@ -230,18 +243,9 @@ func (e *EndPoint) GetData() api.DataMap {
//
// var TotalEnergyConsumption VirtualPointStruct
- // // pkg := reflection.GetName("", *e)
- // name := api.JoinWithDots(0, "", pkg, e.Request.PsId)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
-
- if len(entries.Map) == 0 {
- break
- }
-
- e.GetEnergyStorageSystem(entries)
- e.GetCommunicationModule(entries)
- e.GetBattery(entries)
+ // e.GetEnergyStorageSystem(entries)
+ // e.GetCommunicationModule(entries)
+ // e.GetBattery(entries)
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceList/struct.go b/iSolarCloud/AppService/queryDeviceList/struct.go
index b6fad25b9..f96d2295b 100644
--- a/iSolarCloud/AppService/queryDeviceList/struct.go
+++ b/iSolarCloud/AppService/queryDeviceList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceListByUserId/data.go b/iSolarCloud/AppService/queryDeviceListByUserId/data.go
index df1405b3a..1bd292651 100644
--- a/iSolarCloud/AppService/queryDeviceListByUserId/data.go
+++ b/iSolarCloud/AppService/queryDeviceListByUserId/data.go
@@ -62,7 +62,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceListByUserId/struct.go b/iSolarCloud/AppService/queryDeviceListByUserId/struct.go
index 679cf90d9..188b1d755 100644
--- a/iSolarCloud/AppService/queryDeviceListByUserId/struct.go
+++ b/iSolarCloud/AppService/queryDeviceListByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceListForApp/data.go b/iSolarCloud/AppService/queryDeviceListForApp/data.go
index e619bb8b6..5fef741d4 100644
--- a/iSolarCloud/AppService/queryDeviceListForApp/data.go
+++ b/iSolarCloud/AppService/queryDeviceListForApp/data.go
@@ -26,6 +26,8 @@ func (rd RequestData) Help() string {
type ResultData struct {
PageList []struct {
+ GoStruct GoStruct.GoStruct `json:"GoStruct" PointDeviceFrom:"PsKey"`
+
AttrId valueTypes.Integer `json:"attr_id"`
ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"`
CommandStatus valueTypes.Integer `json:"command_status"`
@@ -64,14 +66,14 @@ type ResultData struct {
P24 interface{} `json:"p24"`
Posx interface{} `json:"posx"`
Posy interface{} `json:"posy"`
- PsId valueTypes.PsId `json:"ps_id"`
+ PsId valueTypes.PsId `json:"ps_id"`
PsKey valueTypes.PsKey `json:"ps_key"`
RelState valueTypes.Integer `json:"rel_state"`
Sn valueTypes.String `json:"sn" PointName:"Serial Number"`
TypeName valueTypes.String `json:"type_name"`
UUID valueTypes.Integer `json:"uuid"`
- } `json:"pageList" PointId:"page_list" PointNameFromChild:"PsKey" PointNameAppend:"false" PointArrayFlatten:"false" DataTable:"true"`
- RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count" PointIgnore:"true"`
+ } `json:"pageList" PointId:"page_list" PointIdFromChild:"PsKey" PointIdReplace:"true"`
+ RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
}
func (e *ResultData) IsValid() error {
diff --git a/iSolarCloud/AppService/queryDeviceListForApp/struct.go b/iSolarCloud/AppService/queryDeviceListForApp/struct.go
index 499d49ff5..923540a35 100644
--- a/iSolarCloud/AppService/queryDeviceListForApp/struct.go
+++ b/iSolarCloud/AppService/queryDeviceListForApp/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceModelTechnical/data.go b/iSolarCloud/AppService/queryDeviceModelTechnical/data.go
index 287795764..f9452292e 100644
--- a/iSolarCloud/AppService/queryDeviceModelTechnical/data.go
+++ b/iSolarCloud/AppService/queryDeviceModelTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go b/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go
index 054030c6f..071fd94e0 100644
--- a/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go
+++ b/iSolarCloud/AppService/queryDeviceModelTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go
index 5998158dd..7746c98fb 100644
--- a/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go
+++ b/iSolarCloud/AppService/queryDevicePointDayMonthYearDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go b/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go
index add9c4121..e34fd568f 100644
--- a/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go
+++ b/iSolarCloud/AppService/queryDevicePointMinuteDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go
index 058310782..e97917559 100644
--- a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go
+++ b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go
index 23dc31c7e..a1aa402b5 100644
--- a/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go
+++ b/iSolarCloud/AppService/queryDevicePointsDayMonthYearDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go
index e1442072b..c28366945 100644
--- a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go
+++ b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go
index 275cea417..c87086754 100644
--- a/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go
+++ b/iSolarCloud/AppService/queryDeviceRealTimeDataByPsKeys/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceRepairList/data.go b/iSolarCloud/AppService/queryDeviceRepairList/data.go
index 7decd6479..40b3589bb 100644
--- a/iSolarCloud/AppService/queryDeviceRepairList/data.go
+++ b/iSolarCloud/AppService/queryDeviceRepairList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceRepairList/struct.go b/iSolarCloud/AppService/queryDeviceRepairList/struct.go
index 5575b6d4d..306494ba9 100644
--- a/iSolarCloud/AppService/queryDeviceRepairList/struct.go
+++ b/iSolarCloud/AppService/queryDeviceRepairList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go b/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go
index b1b279780..ca55463bf 100644
--- a/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go
+++ b/iSolarCloud/AppService/queryDeviceTypeInfoList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go b/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go
index 2c9adf40d..8ef6f4c78 100644
--- a/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go
+++ b/iSolarCloud/AppService/queryDeviceTypeInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryEnvironmentList/data.go b/iSolarCloud/AppService/queryEnvironmentList/data.go
index 82c8574fc..697107568 100644
--- a/iSolarCloud/AppService/queryEnvironmentList/data.go
+++ b/iSolarCloud/AppService/queryEnvironmentList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryEnvironmentList/struct.go b/iSolarCloud/AppService/queryEnvironmentList/struct.go
index 94cf89dc3..d8836007e 100644
--- a/iSolarCloud/AppService/queryEnvironmentList/struct.go
+++ b/iSolarCloud/AppService/queryEnvironmentList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultList/data.go b/iSolarCloud/AppService/queryFaultList/data.go
index ecb44d4d4..a7238e104 100644
--- a/iSolarCloud/AppService/queryFaultList/data.go
+++ b/iSolarCloud/AppService/queryFaultList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultList/struct.go b/iSolarCloud/AppService/queryFaultList/struct.go
index 29038fb29..d98324a4d 100644
--- a/iSolarCloud/AppService/queryFaultList/struct.go
+++ b/iSolarCloud/AppService/queryFaultList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultPlanDetail/data.go b/iSolarCloud/AppService/queryFaultPlanDetail/data.go
index 2a8b3e95e..d7212dde7 100644
--- a/iSolarCloud/AppService/queryFaultPlanDetail/data.go
+++ b/iSolarCloud/AppService/queryFaultPlanDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultPlanDetail/struct.go b/iSolarCloud/AppService/queryFaultPlanDetail/struct.go
index 90b2a10d0..193350c4d 100644
--- a/iSolarCloud/AppService/queryFaultPlanDetail/struct.go
+++ b/iSolarCloud/AppService/queryFaultPlanDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultRepairSteps/data.go b/iSolarCloud/AppService/queryFaultRepairSteps/data.go
index 71c95fdb6..8de8a3986 100644
--- a/iSolarCloud/AppService/queryFaultRepairSteps/data.go
+++ b/iSolarCloud/AppService/queryFaultRepairSteps/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultRepairSteps/struct.go b/iSolarCloud/AppService/queryFaultRepairSteps/struct.go
index 38cbe4922..fcfdf6e72 100644
--- a/iSolarCloud/AppService/queryFaultRepairSteps/struct.go
+++ b/iSolarCloud/AppService/queryFaultRepairSteps/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go
index 72a744337..1b36bbb90 100644
--- a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go
+++ b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go
index 95289577b..b18183304 100644
--- a/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go
+++ b/iSolarCloud/AppService/queryFaultTypeAndLevelByCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultTypeByDevice/data.go b/iSolarCloud/AppService/queryFaultTypeByDevice/data.go
index 0fc324c01..7a6f387ba 100644
--- a/iSolarCloud/AppService/queryFaultTypeByDevice/data.go
+++ b/iSolarCloud/AppService/queryFaultTypeByDevice/data.go
@@ -4,15 +4,14 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/faultService/queryFaultTypeByDevice"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -24,9 +23,15 @@ func (rd RequestData) Help() string {
return ret
}
+type ResultData []struct {
+ GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true"`
-type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+ DevFaultTypeCode valueTypes.String `json:"dev_fault_type_code"`
+ FaultTypeCode valueTypes.Integer `json:"fault_type_code"`
+ FaultTypeCodeList []valueTypes.Integer `json:"fault_type_code_list"`
+ FaultTypeCode2 valueTypes.Integer `json:"faulttypecode" PointId:"fault_type_code2"`
+ FaultValue valueTypes.String `json:"faultvalue" PointId:"fault_value"`
+ IsAllowOwnerView valueTypes.Bool `json:"is_allow_owner_view"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +39,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go b/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go
index 57c6829a3..3500072d2 100644
--- a/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go
+++ b/iSolarCloud/AppService/queryFaultTypeByDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go b/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go
index 244989cb3..ef9cada9e 100644
--- a/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go
+++ b/iSolarCloud/AppService/queryFaultTypeByDevicePage/data.go
@@ -4,15 +4,14 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/faultService/queryFaultTypeByDevicePage"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -24,9 +23,20 @@ func (rd RequestData) Help() string {
return ret
}
-
type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+ PageList []struct {
+ DevFaultTypeCode valueTypes.String `json:"dev_fault_type_code"`
+ FaultTypeCode valueTypes.Integer `json:"fault_type_code"`
+ FaultTypeCode2 valueTypes.Integer `json:"faulttypecode" PointId:"fault_type_code2"`
+ FaultValue valueTypes.String `json:"faultvalue" PointId:"fault_value"`
+ IsAllowOwnerView valueTypes.Bool `json:"is_allow_owner_view"`
+ } `json:"pageList" PointId:"page_list" DataTable:"true"`
+ CurPage valueTypes.Integer `json:"curPage" PointId:"cur_page"`
+ IsMore valueTypes.Bool `json:"isMore" PointId:"is_more"`
+ RowCount valueTypes.Integer `json:"rowCount" PointId:"row_count"`
+ Size valueTypes.Integer `json:"size"`
+ StartIndex valueTypes.Integer `json:"startIndex" PointId:"start_index"`
+ TotalPage valueTypes.Integer `json:"totalPage" PointId:"total_page"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +44,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go b/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go
index 76278ce3f..8cc1d6ea3 100644
--- a/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go
+++ b/iSolarCloud/AppService/queryFaultTypeByDevicePage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
index 7ae130ac8..7e67e2ea1 100644
--- a/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
+++ b/iSolarCloud/AppService/queryFirmwareFilesPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go b/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go
index 5b7ad66cf..43e22105a 100644
--- a/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go
+++ b/iSolarCloud/AppService/queryFirmwareFilesPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryInfotoAlert/data.go b/iSolarCloud/AppService/queryInfotoAlert/data.go
index 0ccf61f08..afd3d5dbe 100644
--- a/iSolarCloud/AppService/queryInfotoAlert/data.go
+++ b/iSolarCloud/AppService/queryInfotoAlert/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryInfotoAlert/struct.go b/iSolarCloud/AppService/queryInfotoAlert/struct.go
index 7cc75a13f..38adf2563 100644
--- a/iSolarCloud/AppService/queryInfotoAlert/struct.go
+++ b/iSolarCloud/AppService/queryInfotoAlert/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryInverterModelList/data.go b/iSolarCloud/AppService/queryInverterModelList/data.go
index c8cd3987d..af409bbc2 100644
--- a/iSolarCloud/AppService/queryInverterModelList/data.go
+++ b/iSolarCloud/AppService/queryInverterModelList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryInverterModelList/struct.go b/iSolarCloud/AppService/queryInverterModelList/struct.go
index 2af163624..36e61dbe7 100644
--- a/iSolarCloud/AppService/queryInverterModelList/struct.go
+++ b/iSolarCloud/AppService/queryInverterModelList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryInverterVersionList/data.go b/iSolarCloud/AppService/queryInverterVersionList/data.go
index e7eae7cda..59da84243 100644
--- a/iSolarCloud/AppService/queryInverterVersionList/data.go
+++ b/iSolarCloud/AppService/queryInverterVersionList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryInverterVersionList/struct.go b/iSolarCloud/AppService/queryInverterVersionList/struct.go
index 3852d8960..04e8b6602 100644
--- a/iSolarCloud/AppService/queryInverterVersionList/struct.go
+++ b/iSolarCloud/AppService/queryInverterVersionList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go b/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go
index 7f95d2c80..8f616c280 100644
--- a/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go
+++ b/iSolarCloud/AppService/queryM2MCardInfoCMCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go b/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go
index 53e6f2b20..a682b18ca 100644
--- a/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go
+++ b/iSolarCloud/AppService/queryM2MCardInfoCMCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go
index b77a8101b..d923a0df8 100644
--- a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go
+++ b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go
index c408d1dfa..86463dff8 100644
--- a/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go
+++ b/iSolarCloud/AppService/queryM2MCardTermInfoCMCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryModelInfoByModelId/data.go b/iSolarCloud/AppService/queryModelInfoByModelId/data.go
index 9445d6a68..5cc10d687 100644
--- a/iSolarCloud/AppService/queryModelInfoByModelId/data.go
+++ b/iSolarCloud/AppService/queryModelInfoByModelId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryModelInfoByModelId/struct.go b/iSolarCloud/AppService/queryModelInfoByModelId/struct.go
index 247a88ff1..6daefe67c 100644
--- a/iSolarCloud/AppService/queryModelInfoByModelId/struct.go
+++ b/iSolarCloud/AppService/queryModelInfoByModelId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryMutiPointDataList/data.go b/iSolarCloud/AppService/queryMutiPointDataList/data.go
index 5f8935cbc..f0a044977 100644
--- a/iSolarCloud/AppService/queryMutiPointDataList/data.go
+++ b/iSolarCloud/AppService/queryMutiPointDataList/data.go
@@ -239,7 +239,7 @@ func (e *EndPoint) GetData() api.DataMap {
// name := pkg + "." + e.Request.PsId.String()
entries.StructToDataMap(*e, e.Request.PsId.String(), GoStruct.NewEndPointPath(e.Request.PsId.String()))
- // entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ // entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryMutiPointDataList/struct.go b/iSolarCloud/AppService/queryMutiPointDataList/struct.go
index b7570790f..29f28cd2b 100644
--- a/iSolarCloud/AppService/queryMutiPointDataList/struct.go
+++ b/iSolarCloud/AppService/queryMutiPointDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryNoticeList/data.go b/iSolarCloud/AppService/queryNoticeList/data.go
index d0448eec4..193bd316a 100644
--- a/iSolarCloud/AppService/queryNoticeList/data.go
+++ b/iSolarCloud/AppService/queryNoticeList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryNoticeList/struct.go b/iSolarCloud/AppService/queryNoticeList/struct.go
index d9b0965ea..e041e64db 100644
--- a/iSolarCloud/AppService/queryNoticeList/struct.go
+++ b/iSolarCloud/AppService/queryNoticeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go b/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go
index 851858cfa..1d26dcd25 100644
--- a/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go
+++ b/iSolarCloud/AppService/queryNumberOfRenewalReminders/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go b/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go
index eb0a3c996..b446de75b 100644
--- a/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go
+++ b/iSolarCloud/AppService/queryNumberOfRenewalReminders/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOperRules/data.go b/iSolarCloud/AppService/queryOperRules/data.go
index aef0f8932..b7e365f17 100644
--- a/iSolarCloud/AppService/queryOperRules/data.go
+++ b/iSolarCloud/AppService/queryOperRules/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOperRules/struct.go b/iSolarCloud/AppService/queryOperRules/struct.go
index 4774a5915..9c03004a3 100644
--- a/iSolarCloud/AppService/queryOperRules/struct.go
+++ b/iSolarCloud/AppService/queryOperRules/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrderList/data.go b/iSolarCloud/AppService/queryOrderList/data.go
index c8dde8608..6d436fd1a 100644
--- a/iSolarCloud/AppService/queryOrderList/data.go
+++ b/iSolarCloud/AppService/queryOrderList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrderList/struct.go b/iSolarCloud/AppService/queryOrderList/struct.go
index 98f9aa1a4..ff9461797 100644
--- a/iSolarCloud/AppService/queryOrderList/struct.go
+++ b/iSolarCloud/AppService/queryOrderList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrderStep/data.go b/iSolarCloud/AppService/queryOrderStep/data.go
index 15ae18ad5..a267e0429 100644
--- a/iSolarCloud/AppService/queryOrderStep/data.go
+++ b/iSolarCloud/AppService/queryOrderStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrderStep/struct.go b/iSolarCloud/AppService/queryOrderStep/struct.go
index d4fa2f071..e5733d62d 100644
--- a/iSolarCloud/AppService/queryOrderStep/struct.go
+++ b/iSolarCloud/AppService/queryOrderStep/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrgGenerationReport/data.go b/iSolarCloud/AppService/queryOrgGenerationReport/data.go
index f7a658c2e..35aeefb14 100644
--- a/iSolarCloud/AppService/queryOrgGenerationReport/data.go
+++ b/iSolarCloud/AppService/queryOrgGenerationReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrgGenerationReport/struct.go b/iSolarCloud/AppService/queryOrgGenerationReport/struct.go
index a55442f59..92688fbbf 100644
--- a/iSolarCloud/AppService/queryOrgGenerationReport/struct.go
+++ b/iSolarCloud/AppService/queryOrgGenerationReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrgInfoList/data.go b/iSolarCloud/AppService/queryOrgInfoList/data.go
index 2afe41e80..a6986723d 100644
--- a/iSolarCloud/AppService/queryOrgInfoList/data.go
+++ b/iSolarCloud/AppService/queryOrgInfoList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrgInfoList/struct.go b/iSolarCloud/AppService/queryOrgInfoList/struct.go
index 870e2bcff..8d03a2c17 100644
--- a/iSolarCloud/AppService/queryOrgInfoList/struct.go
+++ b/iSolarCloud/AppService/queryOrgInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go b/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go
index 89b0c2a34..c7d9f11b6 100644
--- a/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go
+++ b/iSolarCloud/AppService/queryOrgPowerElecPercent/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go b/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go
index efd0da781..c65b530f1 100644
--- a/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go
+++ b/iSolarCloud/AppService/queryOrgPowerElecPercent/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go
index 1de2ad723..275230a94 100644
--- a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go
+++ b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go
index 1a5ae019b..9ab5bf1a3 100644
--- a/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go
+++ b/iSolarCloud/AppService/queryOrgPsCompensationRecordList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryParamSettingTask/data.go b/iSolarCloud/AppService/queryParamSettingTask/data.go
index 0763bfbc8..dc685fbf1 100644
--- a/iSolarCloud/AppService/queryParamSettingTask/data.go
+++ b/iSolarCloud/AppService/queryParamSettingTask/data.go
@@ -63,7 +63,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryParamSettingTask/struct.go b/iSolarCloud/AppService/queryParamSettingTask/struct.go
index 16cc1ff61..d7d852283 100644
--- a/iSolarCloud/AppService/queryParamSettingTask/struct.go
+++ b/iSolarCloud/AppService/queryParamSettingTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPersonalUnitList/data.go b/iSolarCloud/AppService/queryPersonalUnitList/data.go
index 7d6929fbf..ca6a9c53c 100644
--- a/iSolarCloud/AppService/queryPersonalUnitList/data.go
+++ b/iSolarCloud/AppService/queryPersonalUnitList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPersonalUnitList/struct.go b/iSolarCloud/AppService/queryPersonalUnitList/struct.go
index e82116a51..f2ea29468 100644
--- a/iSolarCloud/AppService/queryPersonalUnitList/struct.go
+++ b/iSolarCloud/AppService/queryPersonalUnitList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPointDataTopOne/data.go b/iSolarCloud/AppService/queryPointDataTopOne/data.go
index f0b770a98..362bf65a9 100644
--- a/iSolarCloud/AppService/queryPointDataTopOne/data.go
+++ b/iSolarCloud/AppService/queryPointDataTopOne/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPointDataTopOne/struct.go b/iSolarCloud/AppService/queryPointDataTopOne/struct.go
index 2bdb4d745..f057f9221 100644
--- a/iSolarCloud/AppService/queryPointDataTopOne/struct.go
+++ b/iSolarCloud/AppService/queryPointDataTopOne/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPowerStationInfo/struct.go b/iSolarCloud/AppService/queryPowerStationInfo/struct.go
index 9128a2d0b..87e52ddf0 100644
--- a/iSolarCloud/AppService/queryPowerStationInfo/struct.go
+++ b/iSolarCloud/AppService/queryPowerStationInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go
index 52e8117ef..d28b5782d 100644
--- a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go
+++ b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go
index 340a27eef..11b26e79a 100644
--- a/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go
+++ b/iSolarCloud/AppService/queryPsAreaByUserIdAndAreaCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsCompensationRecordList/data.go b/iSolarCloud/AppService/queryPsCompensationRecordList/data.go
index 949452a3a..cfe4f7843 100644
--- a/iSolarCloud/AppService/queryPsCompensationRecordList/data.go
+++ b/iSolarCloud/AppService/queryPsCompensationRecordList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go b/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go
index dafc1611b..117b7672d 100644
--- a/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go
+++ b/iSolarCloud/AppService/queryPsCompensationRecordList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsDataByDate/data.go b/iSolarCloud/AppService/queryPsDataByDate/data.go
index 17cedaacc..0e29b93ca 100644
--- a/iSolarCloud/AppService/queryPsDataByDate/data.go
+++ b/iSolarCloud/AppService/queryPsDataByDate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsDataByDate/struct.go b/iSolarCloud/AppService/queryPsDataByDate/struct.go
index 9ee16bef9..904988483 100644
--- a/iSolarCloud/AppService/queryPsDataByDate/struct.go
+++ b/iSolarCloud/AppService/queryPsDataByDate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsIdList/data.go b/iSolarCloud/AppService/queryPsIdList/data.go
index b6f650a85..e65b264ed 100644
--- a/iSolarCloud/AppService/queryPsIdList/data.go
+++ b/iSolarCloud/AppService/queryPsIdList/data.go
@@ -45,7 +45,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsIdList/struct.go b/iSolarCloud/AppService/queryPsIdList/struct.go
index 6c21d1231..c131eba0d 100644
--- a/iSolarCloud/AppService/queryPsIdList/struct.go
+++ b/iSolarCloud/AppService/queryPsIdList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go
index 89f997caa..fe320c54c 100644
--- a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go
+++ b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go
index 87ab07efa..9e98eb270 100644
--- a/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go
+++ b/iSolarCloud/AppService/queryPsListByUserIdAndAreaCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsNameByPsId/data.go b/iSolarCloud/AppService/queryPsNameByPsId/data.go
index 9d76fefa7..6ae656a8d 100644
--- a/iSolarCloud/AppService/queryPsNameByPsId/data.go
+++ b/iSolarCloud/AppService/queryPsNameByPsId/data.go
@@ -41,7 +41,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsNameByPsId/struct.go b/iSolarCloud/AppService/queryPsNameByPsId/struct.go
index 656719dc7..3f3c8917a 100644
--- a/iSolarCloud/AppService/queryPsNameByPsId/struct.go
+++ b/iSolarCloud/AppService/queryPsNameByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsPrByDate/data.go b/iSolarCloud/AppService/queryPsPrByDate/data.go
index e25695214..df6b8cc64 100644
--- a/iSolarCloud/AppService/queryPsPrByDate/data.go
+++ b/iSolarCloud/AppService/queryPsPrByDate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsPrByDate/struct.go b/iSolarCloud/AppService/queryPsPrByDate/struct.go
index fc6a93ceb..3d0478bf8 100644
--- a/iSolarCloud/AppService/queryPsPrByDate/struct.go
+++ b/iSolarCloud/AppService/queryPsPrByDate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsProfit/data.go b/iSolarCloud/AppService/queryPsProfit/data.go
index d00ef9c70..c448a06e6 100644
--- a/iSolarCloud/AppService/queryPsProfit/data.go
+++ b/iSolarCloud/AppService/queryPsProfit/data.go
@@ -60,8 +60,8 @@ type ResultData struct {
ValleyNetPowerQuantity interface{} `json:"valley_net_power_quantity"`
ValleyPowerQuantity interface{} `json:"valley_power_quantity"`
ValleyUsePowerQuantity interface{} `json:"valley_use_power_quantity"`
- } `json:"actual_list" PointId:"actual" PointNameFromChild:"DateId" PointNameDateFormat:"20060102" PointArrayFlatten:"false"` // PointIgnoreIfNilFromChild:"UpdateTime" DataTable:"true"`
- // Need to fix this output - PointNameFromChild:"DateId" isn't working.
+ } `json:"actual_list" PointId:"actual" PointIdFromChild:"DateId" PointNameDateFormat:"20060102" PointArrayFlatten:"false"` // PointIgnoreChildIfFromNil:"UpdateTime" DataTable:"true"`
+ // Need to fix this output - PointIdFromChild:"DateId" isn't working.
PlanList []interface{} `json:"plan_list" PointArrayFlatten:"false"`
}
diff --git a/iSolarCloud/AppService/queryPsProfit/struct.go b/iSolarCloud/AppService/queryPsProfit/struct.go
index e2f7c95c4..2b0960c1b 100644
--- a/iSolarCloud/AppService/queryPsProfit/struct.go
+++ b/iSolarCloud/AppService/queryPsProfit/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go
index 68000b59f..0828fcefb 100644
--- a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go
+++ b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go
index a2d5c6ddc..dee09cc60 100644
--- a/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go
+++ b/iSolarCloud/AppService/queryPsReportComparativeAnalysisOfPowerGeneration/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPsStructureList/data.go b/iSolarCloud/AppService/queryPsStructureList/data.go
index 549eca2d4..71907dd99 100644
--- a/iSolarCloud/AppService/queryPsStructureList/data.go
+++ b/iSolarCloud/AppService/queryPsStructureList/data.go
@@ -46,7 +46,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPsStructureList/struct.go b/iSolarCloud/AppService/queryPsStructureList/struct.go
index 4d1b7ce0e..94584a80d 100644
--- a/iSolarCloud/AppService/queryPsStructureList/struct.go
+++ b/iSolarCloud/AppService/queryPsStructureList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go
index 64c8d73db..92ef7bd2e 100644
--- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go
+++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go
index 79d129f6d..ab78dfc82 100644
--- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go
+++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go
index c7f4888d2..1eb0bde55 100644
--- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go
+++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go
index 2f390bff8..e55340556 100644
--- a/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go
+++ b/iSolarCloud/AppService/queryPuuidsByCommandTotalId2/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryRepairRuleList/data.go b/iSolarCloud/AppService/queryRepairRuleList/data.go
index 9fab22f76..956e993f5 100644
--- a/iSolarCloud/AppService/queryRepairRuleList/data.go
+++ b/iSolarCloud/AppService/queryRepairRuleList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryRepairRuleList/struct.go b/iSolarCloud/AppService/queryRepairRuleList/struct.go
index d8dc9ff1e..0448a0e8c 100644
--- a/iSolarCloud/AppService/queryRepairRuleList/struct.go
+++ b/iSolarCloud/AppService/queryRepairRuleList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryReportListForManagementPage/data.go b/iSolarCloud/AppService/queryReportListForManagementPage/data.go
index dd309a29d..2df65b8cd 100644
--- a/iSolarCloud/AppService/queryReportListForManagementPage/data.go
+++ b/iSolarCloud/AppService/queryReportListForManagementPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryReportListForManagementPage/struct.go b/iSolarCloud/AppService/queryReportListForManagementPage/struct.go
index 4f41c8032..ab40e5fec 100644
--- a/iSolarCloud/AppService/queryReportListForManagementPage/struct.go
+++ b/iSolarCloud/AppService/queryReportListForManagementPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryReportMsg/data.go b/iSolarCloud/AppService/queryReportMsg/data.go
index f550755de..1164c0aae 100644
--- a/iSolarCloud/AppService/queryReportMsg/data.go
+++ b/iSolarCloud/AppService/queryReportMsg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryReportMsg/struct.go b/iSolarCloud/AppService/queryReportMsg/struct.go
index dceba41a8..60b151e85 100644
--- a/iSolarCloud/AppService/queryReportMsg/struct.go
+++ b/iSolarCloud/AppService/queryReportMsg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/querySharingPs/data.go b/iSolarCloud/AppService/querySharingPs/data.go
index 3f452148e..38b468999 100644
--- a/iSolarCloud/AppService/querySharingPs/data.go
+++ b/iSolarCloud/AppService/querySharingPs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/querySharingPs/struct.go b/iSolarCloud/AppService/querySharingPs/struct.go
index d6eb9b060..af6ee8fa6 100644
--- a/iSolarCloud/AppService/querySharingPs/struct.go
+++ b/iSolarCloud/AppService/querySharingPs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/querySysAdvancedParam/data.go b/iSolarCloud/AppService/querySysAdvancedParam/data.go
index 01f8fd86f..50ad4b211 100644
--- a/iSolarCloud/AppService/querySysAdvancedParam/data.go
+++ b/iSolarCloud/AppService/querySysAdvancedParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/querySysAdvancedParam/struct.go b/iSolarCloud/AppService/querySysAdvancedParam/struct.go
index ae48fa82a..b348e9656 100644
--- a/iSolarCloud/AppService/querySysAdvancedParam/struct.go
+++ b/iSolarCloud/AppService/querySysAdvancedParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryTimeBySN/data.go b/iSolarCloud/AppService/queryTimeBySN/data.go
index 240c70cc8..9bc9e4d58 100644
--- a/iSolarCloud/AppService/queryTimeBySN/data.go
+++ b/iSolarCloud/AppService/queryTimeBySN/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryTimeBySN/struct.go b/iSolarCloud/AppService/queryTimeBySN/struct.go
index 2b315aa18..67eae6f07 100644
--- a/iSolarCloud/AppService/queryTimeBySN/struct.go
+++ b/iSolarCloud/AppService/queryTimeBySN/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go b/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go
index 41bf3ce80..272b7b84b 100644
--- a/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go
+++ b/iSolarCloud/AppService/queryTrafficByDateCTCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go b/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go
index 790d6dd55..55ce1350e 100644
--- a/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go
+++ b/iSolarCloud/AppService/queryTrafficByDateCTCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryTrafficCTCC/data.go b/iSolarCloud/AppService/queryTrafficCTCC/data.go
index 0e7103a2a..702bf5de3 100644
--- a/iSolarCloud/AppService/queryTrafficCTCC/data.go
+++ b/iSolarCloud/AppService/queryTrafficCTCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryTrafficCTCC/struct.go b/iSolarCloud/AppService/queryTrafficCTCC/struct.go
index 1ea512018..f984e488f 100644
--- a/iSolarCloud/AppService/queryTrafficCTCC/struct.go
+++ b/iSolarCloud/AppService/queryTrafficCTCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUnitList/data.go b/iSolarCloud/AppService/queryUnitList/data.go
index 997b7a31e..b6e25b9aa 100644
--- a/iSolarCloud/AppService/queryUnitList/data.go
+++ b/iSolarCloud/AppService/queryUnitList/data.go
@@ -24,7 +24,7 @@ func (rd RequestData) Help() string {
}
type ResultData []struct {
- GoStruct GoStruct.GoStruct `json:"GoStruct" DataTable:"true" DataTableSortOn:"UnitConvertId"`
+ GoStructParent GoStruct.GoStructParent `json:"GoStruct" DataTable:"true" DataTableSortOn:"UnitConvertId"`
UnitConvertId valueTypes.Integer `json:"unit_conver_id" PointId:"unit_convert_id"`
UnitName valueTypes.String `json:"unit_name"`
@@ -41,7 +41,7 @@ func (e *ResultData) IsValid() error {
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
- return entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ return entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
diff --git a/iSolarCloud/AppService/queryUnitList/struct.go b/iSolarCloud/AppService/queryUnitList/struct.go
index a5a1c31df..fc845a4e8 100644
--- a/iSolarCloud/AppService/queryUnitList/struct.go
+++ b/iSolarCloud/AppService/queryUnitList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go b/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go
index 389bd0992..ef5e97f71 100644
--- a/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go
+++ b/iSolarCloud/AppService/queryUnitUuidBytotalId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go b/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go
index 656b6b63b..b0ed2f628 100644
--- a/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go
+++ b/iSolarCloud/AppService/queryUnitUuidBytotalId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserBtnPri/data.go b/iSolarCloud/AppService/queryUserBtnPri/data.go
index 1f8cbfd10..f295869e5 100644
--- a/iSolarCloud/AppService/queryUserBtnPri/data.go
+++ b/iSolarCloud/AppService/queryUserBtnPri/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserBtnPri/struct.go b/iSolarCloud/AppService/queryUserBtnPri/struct.go
index b56f4f43e..fa3e0b862 100644
--- a/iSolarCloud/AppService/queryUserBtnPri/struct.go
+++ b/iSolarCloud/AppService/queryUserBtnPri/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserByUserIds/data.go b/iSolarCloud/AppService/queryUserByUserIds/data.go
index ec3ccce8d..7a8a44cad 100644
--- a/iSolarCloud/AppService/queryUserByUserIds/data.go
+++ b/iSolarCloud/AppService/queryUserByUserIds/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserByUserIds/struct.go b/iSolarCloud/AppService/queryUserByUserIds/struct.go
index 625b77f20..70a158b1a 100644
--- a/iSolarCloud/AppService/queryUserByUserIds/struct.go
+++ b/iSolarCloud/AppService/queryUserByUserIds/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserExtensionAttribute/data.go b/iSolarCloud/AppService/queryUserExtensionAttribute/data.go
index abb11a435..4a7864c9a 100644
--- a/iSolarCloud/AppService/queryUserExtensionAttribute/data.go
+++ b/iSolarCloud/AppService/queryUserExtensionAttribute/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go b/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go
index 889261d5c..ffea218ca 100644
--- a/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go
+++ b/iSolarCloud/AppService/queryUserExtensionAttribute/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserForStep/data.go b/iSolarCloud/AppService/queryUserForStep/data.go
index 4f3f95b81..9aab3575e 100644
--- a/iSolarCloud/AppService/queryUserForStep/data.go
+++ b/iSolarCloud/AppService/queryUserForStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserForStep/struct.go b/iSolarCloud/AppService/queryUserForStep/struct.go
index 28cbd4bfc..aec6a82df 100644
--- a/iSolarCloud/AppService/queryUserForStep/struct.go
+++ b/iSolarCloud/AppService/queryUserForStep/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserList/data.go b/iSolarCloud/AppService/queryUserList/data.go
index 626b2bf12..83f533da4 100644
--- a/iSolarCloud/AppService/queryUserList/data.go
+++ b/iSolarCloud/AppService/queryUserList/data.go
@@ -62,7 +62,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserList/struct.go b/iSolarCloud/AppService/queryUserList/struct.go
index f690a4e44..26c19ca4d 100644
--- a/iSolarCloud/AppService/queryUserList/struct.go
+++ b/iSolarCloud/AppService/queryUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserProcessPri/data.go b/iSolarCloud/AppService/queryUserProcessPri/data.go
index 433395a87..ae42736b2 100644
--- a/iSolarCloud/AppService/queryUserProcessPri/data.go
+++ b/iSolarCloud/AppService/queryUserProcessPri/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserProcessPri/struct.go b/iSolarCloud/AppService/queryUserProcessPri/struct.go
index 6558f1bba..e493b178b 100644
--- a/iSolarCloud/AppService/queryUserProcessPri/struct.go
+++ b/iSolarCloud/AppService/queryUserProcessPri/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUserWechatBindRel/data.go b/iSolarCloud/AppService/queryUserWechatBindRel/data.go
index bffc2832d..2d7822e4c 100644
--- a/iSolarCloud/AppService/queryUserWechatBindRel/data.go
+++ b/iSolarCloud/AppService/queryUserWechatBindRel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUserWechatBindRel/struct.go b/iSolarCloud/AppService/queryUserWechatBindRel/struct.go
index c6b5e20f9..86f082584 100644
--- a/iSolarCloud/AppService/queryUserWechatBindRel/struct.go
+++ b/iSolarCloud/AppService/queryUserWechatBindRel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go
index 8454a10d8..5c20986db 100644
--- a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go
+++ b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go
index 99acd8e94..260d58bde 100644
--- a/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go
+++ b/iSolarCloud/AppService/queryUuidByTotalIdAndUuid/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/rechargeOrderSetMeal/data.go b/iSolarCloud/AppService/rechargeOrderSetMeal/data.go
index 4daf8b1c6..09365275e 100644
--- a/iSolarCloud/AppService/rechargeOrderSetMeal/data.go
+++ b/iSolarCloud/AppService/rechargeOrderSetMeal/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go b/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go
index 3b5e63bb9..cc0b4cad5 100644
--- a/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go
+++ b/iSolarCloud/AppService/rechargeOrderSetMeal/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go b/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go
index e4c989ff0..4679c075e 100644
--- a/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go
+++ b/iSolarCloud/AppService/renewSendReportConfirmEmail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go b/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go
index 5ec634963..14a1334db 100644
--- a/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go
+++ b/iSolarCloud/AppService/renewSendReportConfirmEmail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/reportList/data.go b/iSolarCloud/AppService/reportList/data.go
index 23865f5c8..c456619f8 100644
--- a/iSolarCloud/AppService/reportList/data.go
+++ b/iSolarCloud/AppService/reportList/data.go
@@ -31,18 +31,20 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- DataList []DataList `json:"dataList" PointId:"data_list" PointIgnoreIfNilFromChild:"UpdateTime" PointNameFromChild:"DateId" PointNameDateFormat:"20060102" PointNameAppend:"true"`
- Info Common.ReportInfo `json:"info" PointArrayFlatten:"false"`
+ Info Common.ReportInfo `json:"info" PointArrayFlatten:"false"`
+ DataList []DataList `json:"dataList" PointId:"data_list" DataTable:"true" PointIgnoreChildIfFromNil:"UpdateTime" PointIdFromChild:"UpdateTime" PointNameDateFormat:"20060102" PointIdReplace:"false"`
MinDateId interface{} `json:"min_date_id"`
- Total []DataList `json:"total" PointId:"total" PointIgnoreIfNilFromChild:"UpdateTime" PointNameFromChild:"UpdateTime" PointNameDateFormat:"20060102" PointNameAppend:"true" PointArrayFlatten:"false"`
+ Total []DataList `json:"total" PointId:"total" DataTable:"true" PointIgnoreChildIfFromNil:"UpdateTime" PointIdFromChild:"UpdateTime" PointNameDateFormat:"20060102" PointIdReplace:"false" PointArrayFlatten:"false"`
}
type DataList struct {
+ // GoStruct GoStruct.GoStruct `json:"GoStruct,omitempty"`
+
DateId valueTypes.DateTime `json:"date_id"`
DeviceName interface{} `json:"device_name"`
PsId valueTypes.PsId `json:"ps_id"`
TimeStamp valueTypes.Integer `json:"time_stamp"` // Sad that this alternates between string and valueTypes.Integer.
- UpdateTime valueTypes.DateTime `json:"update_time"`
+ UpdateTime valueTypes.DateTime `json:"update_time" PointNameDateFormat:"20060102"`
UUID interface{} `json:"uuid"`
Co2Reduce valueTypes.Float `json:"co2_reduce"`
diff --git a/iSolarCloud/AppService/reportList/struct.go b/iSolarCloud/AppService/reportList/struct.go
index 9d4e74783..88c2b5056 100644
--- a/iSolarCloud/AppService/reportList/struct.go
+++ b/iSolarCloud/AppService/reportList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveCustomerEmployee/data.go b/iSolarCloud/AppService/saveCustomerEmployee/data.go
index 6c86bd5ba..30ebe84e5 100644
--- a/iSolarCloud/AppService/saveCustomerEmployee/data.go
+++ b/iSolarCloud/AppService/saveCustomerEmployee/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveCustomerEmployee/struct.go b/iSolarCloud/AppService/saveCustomerEmployee/struct.go
index 009cded94..7f0bb91ac 100644
--- a/iSolarCloud/AppService/saveCustomerEmployee/struct.go
+++ b/iSolarCloud/AppService/saveCustomerEmployee/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveDevSimList/data.go b/iSolarCloud/AppService/saveDevSimList/data.go
index ac7f473eb..caa742f2b 100644
--- a/iSolarCloud/AppService/saveDevSimList/data.go
+++ b/iSolarCloud/AppService/saveDevSimList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveDevSimList/struct.go b/iSolarCloud/AppService/saveDevSimList/struct.go
index 472f6db39..fb569cff5 100644
--- a/iSolarCloud/AppService/saveDevSimList/struct.go
+++ b/iSolarCloud/AppService/saveDevSimList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go b/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go
index a99edd8a7..31ade4fec 100644
--- a/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go
+++ b/iSolarCloud/AppService/saveDeviceAccountBatchData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go b/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go
index a4317c53e..4edaab77e 100644
--- a/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go
+++ b/iSolarCloud/AppService/saveDeviceAccountBatchData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go b/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go
index fcce096bb..76b77a84a 100644
--- a/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go
+++ b/iSolarCloud/AppService/saveEnviromentIncomeInfos/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go b/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go
index eb2eb7539..2eb90e461 100644
--- a/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go
+++ b/iSolarCloud/AppService/saveEnviromentIncomeInfos/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveEnvironmentCurve/data.go b/iSolarCloud/AppService/saveEnvironmentCurve/data.go
index e59ad8f7a..f36c0f9dd 100644
--- a/iSolarCloud/AppService/saveEnvironmentCurve/data.go
+++ b/iSolarCloud/AppService/saveEnvironmentCurve/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveEnvironmentCurve/struct.go b/iSolarCloud/AppService/saveEnvironmentCurve/struct.go
index a5cffe524..d21779287 100644
--- a/iSolarCloud/AppService/saveEnvironmentCurve/struct.go
+++ b/iSolarCloud/AppService/saveEnvironmentCurve/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveFirmwareFile/data.go b/iSolarCloud/AppService/saveFirmwareFile/data.go
index 7644d9a67..692de33f6 100644
--- a/iSolarCloud/AppService/saveFirmwareFile/data.go
+++ b/iSolarCloud/AppService/saveFirmwareFile/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveFirmwareFile/struct.go b/iSolarCloud/AppService/saveFirmwareFile/struct.go
index 3a650ac20..a4c93a7be 100644
--- a/iSolarCloud/AppService/saveFirmwareFile/struct.go
+++ b/iSolarCloud/AppService/saveFirmwareFile/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveIncomeSettingInfos/data.go b/iSolarCloud/AppService/saveIncomeSettingInfos/data.go
index 22c84baa9..488faa853 100644
--- a/iSolarCloud/AppService/saveIncomeSettingInfos/data.go
+++ b/iSolarCloud/AppService/saveIncomeSettingInfos/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go b/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go
index 7f620968e..7f18c178d 100644
--- a/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go
+++ b/iSolarCloud/AppService/saveIncomeSettingInfos/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go
index 3f75b466b..f3156797c 100644
--- a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go
+++ b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go
index 0c9a73892..2ae4084fd 100644
--- a/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go
+++ b/iSolarCloud/AppService/saveOrUpdateGroupStringCheckRule/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveParamModel/data.go b/iSolarCloud/AppService/saveParamModel/data.go
index d30927da9..a0961baae 100644
--- a/iSolarCloud/AppService/saveParamModel/data.go
+++ b/iSolarCloud/AppService/saveParamModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveParamModel/struct.go b/iSolarCloud/AppService/saveParamModel/struct.go
index 9bac9bc62..a12d419b2 100644
--- a/iSolarCloud/AppService/saveParamModel/struct.go
+++ b/iSolarCloud/AppService/saveParamModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerCharges/data.go b/iSolarCloud/AppService/savePowerCharges/data.go
index cefe84abc..77c2c1537 100644
--- a/iSolarCloud/AppService/savePowerCharges/data.go
+++ b/iSolarCloud/AppService/savePowerCharges/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerCharges/struct.go b/iSolarCloud/AppService/savePowerCharges/struct.go
index 87c0aaaa3..563c11196 100644
--- a/iSolarCloud/AppService/savePowerCharges/struct.go
+++ b/iSolarCloud/AppService/savePowerCharges/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerDevicePoint/data.go b/iSolarCloud/AppService/savePowerDevicePoint/data.go
index c878a52a7..807c1df9c 100644
--- a/iSolarCloud/AppService/savePowerDevicePoint/data.go
+++ b/iSolarCloud/AppService/savePowerDevicePoint/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerDevicePoint/struct.go b/iSolarCloud/AppService/savePowerDevicePoint/struct.go
index 499ba8d53..de11d4139 100644
--- a/iSolarCloud/AppService/savePowerDevicePoint/struct.go
+++ b/iSolarCloud/AppService/savePowerDevicePoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerRobotInfo/data.go b/iSolarCloud/AppService/savePowerRobotInfo/data.go
index 402169279..a647b8e1c 100644
--- a/iSolarCloud/AppService/savePowerRobotInfo/data.go
+++ b/iSolarCloud/AppService/savePowerRobotInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerRobotInfo/struct.go b/iSolarCloud/AppService/savePowerRobotInfo/struct.go
index 730026ad0..f42c44e22 100644
--- a/iSolarCloud/AppService/savePowerRobotInfo/struct.go
+++ b/iSolarCloud/AppService/savePowerRobotInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go b/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go
index dcb525bed..7b7ec4e0d 100644
--- a/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go
+++ b/iSolarCloud/AppService/savePowerRobotSweepAttr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go b/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go
index cd7abb1a7..534de28f1 100644
--- a/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go
+++ b/iSolarCloud/AppService/savePowerRobotSweepAttr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerSettingCharges/data.go b/iSolarCloud/AppService/savePowerSettingCharges/data.go
index 9f82563da..5464723d6 100644
--- a/iSolarCloud/AppService/savePowerSettingCharges/data.go
+++ b/iSolarCloud/AppService/savePowerSettingCharges/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerSettingCharges/struct.go b/iSolarCloud/AppService/savePowerSettingCharges/struct.go
index cfa17666f..908a57c98 100644
--- a/iSolarCloud/AppService/savePowerSettingCharges/struct.go
+++ b/iSolarCloud/AppService/savePowerSettingCharges/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/savePowerSettingInfo/data.go b/iSolarCloud/AppService/savePowerSettingInfo/data.go
index f9ed0a9fb..4e5d10e4c 100644
--- a/iSolarCloud/AppService/savePowerSettingInfo/data.go
+++ b/iSolarCloud/AppService/savePowerSettingInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/savePowerSettingInfo/struct.go b/iSolarCloud/AppService/savePowerSettingInfo/struct.go
index cd249bd69..ea8ed7250 100644
--- a/iSolarCloud/AppService/savePowerSettingInfo/struct.go
+++ b/iSolarCloud/AppService/savePowerSettingInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveProductionBatchData/data.go b/iSolarCloud/AppService/saveProductionBatchData/data.go
index 4a7074e5a..17eb1450f 100644
--- a/iSolarCloud/AppService/saveProductionBatchData/data.go
+++ b/iSolarCloud/AppService/saveProductionBatchData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveProductionBatchData/struct.go b/iSolarCloud/AppService/saveProductionBatchData/struct.go
index 5dba9b7a0..4a0f74999 100644
--- a/iSolarCloud/AppService/saveProductionBatchData/struct.go
+++ b/iSolarCloud/AppService/saveProductionBatchData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveRechargeOrderObj/data.go b/iSolarCloud/AppService/saveRechargeOrderObj/data.go
index 44e2d4635..6f062eed4 100644
--- a/iSolarCloud/AppService/saveRechargeOrderObj/data.go
+++ b/iSolarCloud/AppService/saveRechargeOrderObj/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveRechargeOrderObj/struct.go b/iSolarCloud/AppService/saveRechargeOrderObj/struct.go
index ba315cc1b..5d5abdc8c 100644
--- a/iSolarCloud/AppService/saveRechargeOrderObj/struct.go
+++ b/iSolarCloud/AppService/saveRechargeOrderObj/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go
index fe576ed2f..48a0041ab 100644
--- a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go
+++ b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go
index 58a8bd6f6..dc3c7bc14 100644
--- a/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go
+++ b/iSolarCloud/AppService/saveRechargeOrderOtherInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveRepair/data.go b/iSolarCloud/AppService/saveRepair/data.go
index 4ee3cecc5..4930ad4ba 100644
--- a/iSolarCloud/AppService/saveRepair/data.go
+++ b/iSolarCloud/AppService/saveRepair/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveRepair/struct.go b/iSolarCloud/AppService/saveRepair/struct.go
index 2ccde14b7..d54405ca5 100644
--- a/iSolarCloud/AppService/saveRepair/struct.go
+++ b/iSolarCloud/AppService/saveRepair/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveReportExportColumns/data.go b/iSolarCloud/AppService/saveReportExportColumns/data.go
index ad60f38c1..88ba04af0 100644
--- a/iSolarCloud/AppService/saveReportExportColumns/data.go
+++ b/iSolarCloud/AppService/saveReportExportColumns/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveReportExportColumns/struct.go b/iSolarCloud/AppService/saveReportExportColumns/struct.go
index e8fa6c053..8fd8fbe2f 100644
--- a/iSolarCloud/AppService/saveReportExportColumns/struct.go
+++ b/iSolarCloud/AppService/saveReportExportColumns/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveSetParam/data.go b/iSolarCloud/AppService/saveSetParam/data.go
index 012388638..ab29a812e 100644
--- a/iSolarCloud/AppService/saveSetParam/data.go
+++ b/iSolarCloud/AppService/saveSetParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveSetParam/struct.go b/iSolarCloud/AppService/saveSetParam/struct.go
index 2a328d207..4697899c1 100644
--- a/iSolarCloud/AppService/saveSetParam/struct.go
+++ b/iSolarCloud/AppService/saveSetParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveSysUserMsg/data.go b/iSolarCloud/AppService/saveSysUserMsg/data.go
index c89296f6d..4ca7f096f 100644
--- a/iSolarCloud/AppService/saveSysUserMsg/data.go
+++ b/iSolarCloud/AppService/saveSysUserMsg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveSysUserMsg/struct.go b/iSolarCloud/AppService/saveSysUserMsg/struct.go
index 3e3d792c4..1ea6fe948 100644
--- a/iSolarCloud/AppService/saveSysUserMsg/struct.go
+++ b/iSolarCloud/AppService/saveSysUserMsg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/saveTemplate/data.go b/iSolarCloud/AppService/saveTemplate/data.go
index d089d3b46..b69c2268f 100644
--- a/iSolarCloud/AppService/saveTemplate/data.go
+++ b/iSolarCloud/AppService/saveTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/saveTemplate/struct.go b/iSolarCloud/AppService/saveTemplate/struct.go
index e69457bb0..c5ccb280b 100644
--- a/iSolarCloud/AppService/saveTemplate/struct.go
+++ b/iSolarCloud/AppService/saveTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go
index fcaa8e9a7..e09fb7c0a 100644
--- a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go
+++ b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go
index b775612b2..c720027da 100644
--- a/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go
+++ b/iSolarCloud/AppService/searchM2MMonthFlowCMCC/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/selectSysTranslationNames/data.go b/iSolarCloud/AppService/selectSysTranslationNames/data.go
index a25fff383..661120d4b 100644
--- a/iSolarCloud/AppService/selectSysTranslationNames/data.go
+++ b/iSolarCloud/AppService/selectSysTranslationNames/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/selectSysTranslationNames/struct.go b/iSolarCloud/AppService/selectSysTranslationNames/struct.go
index 2906af3e1..156563efb 100644
--- a/iSolarCloud/AppService/selectSysTranslationNames/struct.go
+++ b/iSolarCloud/AppService/selectSysTranslationNames/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go b/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go
index eb8d689f2..b005706aa 100644
--- a/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go
+++ b/iSolarCloud/AppService/sendPsTimeZoneInstruction/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go b/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go
index ce76a2226..6e6095171 100644
--- a/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go
+++ b/iSolarCloud/AppService/sendPsTimeZoneInstruction/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go
index 7d36bc198..81e5d2f34 100644
--- a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go
+++ b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go
index 6e017c6e5..af862dcf7 100644
--- a/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go
+++ b/iSolarCloud/AppService/setUpFormulaFaultAnalyse/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/setUserGDPRAttrs/data.go b/iSolarCloud/AppService/setUserGDPRAttrs/data.go
index f6a792022..34bcbedb6 100644
--- a/iSolarCloud/AppService/setUserGDPRAttrs/data.go
+++ b/iSolarCloud/AppService/setUserGDPRAttrs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/setUserGDPRAttrs/struct.go b/iSolarCloud/AppService/setUserGDPRAttrs/struct.go
index 407d5f80a..cd02ccea6 100644
--- a/iSolarCloud/AppService/setUserGDPRAttrs/struct.go
+++ b/iSolarCloud/AppService/setUserGDPRAttrs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/settingNotice/data.go b/iSolarCloud/AppService/settingNotice/data.go
index 5a41dac86..553c74888 100644
--- a/iSolarCloud/AppService/settingNotice/data.go
+++ b/iSolarCloud/AppService/settingNotice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/settingNotice/struct.go b/iSolarCloud/AppService/settingNotice/struct.go
index 7591144b6..77521bf84 100644
--- a/iSolarCloud/AppService/settingNotice/struct.go
+++ b/iSolarCloud/AppService/settingNotice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/shareMyPs/data.go b/iSolarCloud/AppService/shareMyPs/data.go
index 44bb4f4aa..e26947952 100644
--- a/iSolarCloud/AppService/shareMyPs/data.go
+++ b/iSolarCloud/AppService/shareMyPs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/shareMyPs/struct.go b/iSolarCloud/AppService/shareMyPs/struct.go
index f82278f28..be739dc80 100644
--- a/iSolarCloud/AppService/shareMyPs/struct.go
+++ b/iSolarCloud/AppService/shareMyPs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sharePsBySN/data.go b/iSolarCloud/AppService/sharePsBySN/data.go
index 5e6ae5313..84322549f 100644
--- a/iSolarCloud/AppService/sharePsBySN/data.go
+++ b/iSolarCloud/AppService/sharePsBySN/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sharePsBySN/struct.go b/iSolarCloud/AppService/sharePsBySN/struct.go
index ce89bdd7d..0f2a99eed 100644
--- a/iSolarCloud/AppService/sharePsBySN/struct.go
+++ b/iSolarCloud/AppService/sharePsBySN/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/showInverterByUnit/data.go b/iSolarCloud/AppService/showInverterByUnit/data.go
index 412a21af6..e4485b258 100644
--- a/iSolarCloud/AppService/showInverterByUnit/data.go
+++ b/iSolarCloud/AppService/showInverterByUnit/data.go
@@ -43,7 +43,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/showInverterByUnit/struct.go b/iSolarCloud/AppService/showInverterByUnit/struct.go
index 6df968855..c64273e33 100644
--- a/iSolarCloud/AppService/showInverterByUnit/struct.go
+++ b/iSolarCloud/AppService/showInverterByUnit/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/showOnlineUsers/data.go b/iSolarCloud/AppService/showOnlineUsers/data.go
index 53e490b46..bb43974ee 100644
--- a/iSolarCloud/AppService/showOnlineUsers/data.go
+++ b/iSolarCloud/AppService/showOnlineUsers/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/showOnlineUsers/struct.go b/iSolarCloud/AppService/showOnlineUsers/struct.go
index 49bc566cc..c970ad078 100644
--- a/iSolarCloud/AppService/showOnlineUsers/struct.go
+++ b/iSolarCloud/AppService/showOnlineUsers/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/showWarning/data.go b/iSolarCloud/AppService/showWarning/data.go
index c95bb763a..afe12be0a 100644
--- a/iSolarCloud/AppService/showWarning/data.go
+++ b/iSolarCloud/AppService/showWarning/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/showWarning/struct.go b/iSolarCloud/AppService/showWarning/struct.go
index 70ca027ed..be36ecf60 100644
--- a/iSolarCloud/AppService/showWarning/struct.go
+++ b/iSolarCloud/AppService/showWarning/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/snIsExist/data.go b/iSolarCloud/AppService/snIsExist/data.go
index 0f1b1b4eb..3f8b607ef 100644
--- a/iSolarCloud/AppService/snIsExist/data.go
+++ b/iSolarCloud/AppService/snIsExist/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/snIsExist/struct.go b/iSolarCloud/AppService/snIsExist/struct.go
index df103ec4f..a20cd1993 100644
--- a/iSolarCloud/AppService/snIsExist/struct.go
+++ b/iSolarCloud/AppService/snIsExist/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/snsIsExist/data.go b/iSolarCloud/AppService/snsIsExist/data.go
index 21c4656df..e5a9b5d58 100644
--- a/iSolarCloud/AppService/snsIsExist/data.go
+++ b/iSolarCloud/AppService/snsIsExist/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/snsIsExist/struct.go b/iSolarCloud/AppService/snsIsExist/struct.go
index 86bb1c352..5ff106d79 100644
--- a/iSolarCloud/AppService/snsIsExist/struct.go
+++ b/iSolarCloud/AppService/snsIsExist/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/speedyAddPowerStation/data.go b/iSolarCloud/AppService/speedyAddPowerStation/data.go
index 538b55c51..591fff856 100644
--- a/iSolarCloud/AppService/speedyAddPowerStation/data.go
+++ b/iSolarCloud/AppService/speedyAddPowerStation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/speedyAddPowerStation/struct.go b/iSolarCloud/AppService/speedyAddPowerStation/struct.go
index 5ed5e5478..b73416716 100644
--- a/iSolarCloud/AppService/speedyAddPowerStation/struct.go
+++ b/iSolarCloud/AppService/speedyAddPowerStation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go b/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go
index 9ae2e58f1..cd8448a8e 100644
--- a/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go
+++ b/iSolarCloud/AppService/stationDeviceHistoryDataList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go b/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go
index 25cce3770..955d1c877 100644
--- a/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go
+++ b/iSolarCloud/AppService/stationDeviceHistoryDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationUnitsList/data.go b/iSolarCloud/AppService/stationUnitsList/data.go
index b772f8378..4abb7bd1e 100644
--- a/iSolarCloud/AppService/stationUnitsList/data.go
+++ b/iSolarCloud/AppService/stationUnitsList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationUnitsList/struct.go b/iSolarCloud/AppService/stationUnitsList/struct.go
index e3b9fafbc..713ec6426 100644
--- a/iSolarCloud/AppService/stationUnitsList/struct.go
+++ b/iSolarCloud/AppService/stationUnitsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationsDiscreteData/data.go b/iSolarCloud/AppService/stationsDiscreteData/data.go
index 10de7c888..230105dc2 100644
--- a/iSolarCloud/AppService/stationsDiscreteData/data.go
+++ b/iSolarCloud/AppService/stationsDiscreteData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationsDiscreteData/struct.go b/iSolarCloud/AppService/stationsDiscreteData/struct.go
index 7340c3fff..75ba09f50 100644
--- a/iSolarCloud/AppService/stationsDiscreteData/struct.go
+++ b/iSolarCloud/AppService/stationsDiscreteData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationsIncomeList/data.go b/iSolarCloud/AppService/stationsIncomeList/data.go
index c622f4abb..6312dcaa0 100644
--- a/iSolarCloud/AppService/stationsIncomeList/data.go
+++ b/iSolarCloud/AppService/stationsIncomeList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationsIncomeList/struct.go b/iSolarCloud/AppService/stationsIncomeList/struct.go
index 26bca9889..7da459b55 100644
--- a/iSolarCloud/AppService/stationsIncomeList/struct.go
+++ b/iSolarCloud/AppService/stationsIncomeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationsPointReport/data.go b/iSolarCloud/AppService/stationsPointReport/data.go
index e72a0bd9a..c4ed275da 100644
--- a/iSolarCloud/AppService/stationsPointReport/data.go
+++ b/iSolarCloud/AppService/stationsPointReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationsPointReport/struct.go b/iSolarCloud/AppService/stationsPointReport/struct.go
index 9d6ab04a7..ff1b52b04 100644
--- a/iSolarCloud/AppService/stationsPointReport/struct.go
+++ b/iSolarCloud/AppService/stationsPointReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/stationsYearPlanReport/data.go b/iSolarCloud/AppService/stationsYearPlanReport/data.go
index 3fc248fdc..7b8743eb6 100644
--- a/iSolarCloud/AppService/stationsYearPlanReport/data.go
+++ b/iSolarCloud/AppService/stationsYearPlanReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/stationsYearPlanReport/struct.go b/iSolarCloud/AppService/stationsYearPlanReport/struct.go
index 77efa5253..7f4f107b5 100644
--- a/iSolarCloud/AppService/stationsYearPlanReport/struct.go
+++ b/iSolarCloud/AppService/stationsYearPlanReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sureAndImportSelettlementData/data.go b/iSolarCloud/AppService/sureAndImportSelettlementData/data.go
index ca8eba6a2..6c4de24e2 100644
--- a/iSolarCloud/AppService/sureAndImportSelettlementData/data.go
+++ b/iSolarCloud/AppService/sureAndImportSelettlementData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go b/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go
index 0e3323405..7210f7578 100644
--- a/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go
+++ b/iSolarCloud/AppService/sureAndImportSelettlementData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sweepDevParamSet/data.go b/iSolarCloud/AppService/sweepDevParamSet/data.go
index b9089005d..aa8c688df 100644
--- a/iSolarCloud/AppService/sweepDevParamSet/data.go
+++ b/iSolarCloud/AppService/sweepDevParamSet/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sweepDevParamSet/struct.go b/iSolarCloud/AppService/sweepDevParamSet/struct.go
index 2a7b89375..0f8d564d9 100644
--- a/iSolarCloud/AppService/sweepDevParamSet/struct.go
+++ b/iSolarCloud/AppService/sweepDevParamSet/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sweepDevRunControl/data.go b/iSolarCloud/AppService/sweepDevRunControl/data.go
index 69838897d..3fcc45035 100644
--- a/iSolarCloud/AppService/sweepDevRunControl/data.go
+++ b/iSolarCloud/AppService/sweepDevRunControl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sweepDevRunControl/struct.go b/iSolarCloud/AppService/sweepDevRunControl/struct.go
index cd775e92b..d85d3af24 100644
--- a/iSolarCloud/AppService/sweepDevRunControl/struct.go
+++ b/iSolarCloud/AppService/sweepDevRunControl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sweepDevStrategyIssue/data.go b/iSolarCloud/AppService/sweepDevStrategyIssue/data.go
index 34a6889c9..f8230fd29 100644
--- a/iSolarCloud/AppService/sweepDevStrategyIssue/data.go
+++ b/iSolarCloud/AppService/sweepDevStrategyIssue/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go b/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go
index f2c8f2525..9e394604a 100644
--- a/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go
+++ b/iSolarCloud/AppService/sweepDevStrategyIssue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/sysTimeZoneList/data.go b/iSolarCloud/AppService/sysTimeZoneList/data.go
index 6246336ca..ea40053c6 100644
--- a/iSolarCloud/AppService/sysTimeZoneList/data.go
+++ b/iSolarCloud/AppService/sysTimeZoneList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/sysTimeZoneList/struct.go b/iSolarCloud/AppService/sysTimeZoneList/struct.go
index 248c9e089..a1010c9a9 100644
--- a/iSolarCloud/AppService/sysTimeZoneList/struct.go
+++ b/iSolarCloud/AppService/sysTimeZoneList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/unLockUser/data.go b/iSolarCloud/AppService/unLockUser/data.go
index 17280440c..dfb758182 100644
--- a/iSolarCloud/AppService/unLockUser/data.go
+++ b/iSolarCloud/AppService/unLockUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/unLockUser/struct.go b/iSolarCloud/AppService/unLockUser/struct.go
index b9059890f..625d29894 100644
--- a/iSolarCloud/AppService/unLockUser/struct.go
+++ b/iSolarCloud/AppService/unLockUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/unlockChildAccount/data.go b/iSolarCloud/AppService/unlockChildAccount/data.go
index 47410d062..300a5d9aa 100644
--- a/iSolarCloud/AppService/unlockChildAccount/data.go
+++ b/iSolarCloud/AppService/unlockChildAccount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/unlockChildAccount/struct.go b/iSolarCloud/AppService/unlockChildAccount/struct.go
index 39cbe3361..f197058dd 100644
--- a/iSolarCloud/AppService/unlockChildAccount/struct.go
+++ b/iSolarCloud/AppService/unlockChildAccount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateCommunicationModuleState/data.go b/iSolarCloud/AppService/updateCommunicationModuleState/data.go
index 09be35b24..2219edd02 100644
--- a/iSolarCloud/AppService/updateCommunicationModuleState/data.go
+++ b/iSolarCloud/AppService/updateCommunicationModuleState/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateCommunicationModuleState/struct.go b/iSolarCloud/AppService/updateCommunicationModuleState/struct.go
index f25ecb354..9f7a32e43 100644
--- a/iSolarCloud/AppService/updateCommunicationModuleState/struct.go
+++ b/iSolarCloud/AppService/updateCommunicationModuleState/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateDevInstalledPower/data.go b/iSolarCloud/AppService/updateDevInstalledPower/data.go
index adb7acb2e..89a7be955 100644
--- a/iSolarCloud/AppService/updateDevInstalledPower/data.go
+++ b/iSolarCloud/AppService/updateDevInstalledPower/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateDevInstalledPower/struct.go b/iSolarCloud/AppService/updateDevInstalledPower/struct.go
index 9078aa13b..74690fe1f 100644
--- a/iSolarCloud/AppService/updateDevInstalledPower/struct.go
+++ b/iSolarCloud/AppService/updateDevInstalledPower/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateFault/data.go b/iSolarCloud/AppService/updateFault/data.go
index 1e3f55bc2..46914b5ad 100644
--- a/iSolarCloud/AppService/updateFault/data.go
+++ b/iSolarCloud/AppService/updateFault/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateFault/struct.go b/iSolarCloud/AppService/updateFault/struct.go
index d85dc237f..8deebd2e2 100644
--- a/iSolarCloud/AppService/updateFault/struct.go
+++ b/iSolarCloud/AppService/updateFault/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateFaultData/data.go b/iSolarCloud/AppService/updateFaultData/data.go
index 26c321dbc..5a2779138 100644
--- a/iSolarCloud/AppService/updateFaultData/data.go
+++ b/iSolarCloud/AppService/updateFaultData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateFaultData/struct.go b/iSolarCloud/AppService/updateFaultData/struct.go
index 19143dc9a..34807c6ca 100644
--- a/iSolarCloud/AppService/updateFaultData/struct.go
+++ b/iSolarCloud/AppService/updateFaultData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go b/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go
index 429fb4f47..97b15b148 100644
--- a/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go
+++ b/iSolarCloud/AppService/updateFaultMsgByFaultCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go b/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go
index e065dd955..209711673 100644
--- a/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go
+++ b/iSolarCloud/AppService/updateFaultMsgByFaultCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateFaultStatus/data.go b/iSolarCloud/AppService/updateFaultStatus/data.go
index a93c4e602..d7e6634b2 100644
--- a/iSolarCloud/AppService/updateFaultStatus/data.go
+++ b/iSolarCloud/AppService/updateFaultStatus/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateFaultStatus/struct.go b/iSolarCloud/AppService/updateFaultStatus/struct.go
index e6f041b08..5fa961a62 100644
--- a/iSolarCloud/AppService/updateFaultStatus/struct.go
+++ b/iSolarCloud/AppService/updateFaultStatus/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go b/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go
index 5ae184ff4..abde13917 100644
--- a/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go
+++ b/iSolarCloud/AppService/updateHouseholdWorkOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go b/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go
index 7cc1b69a6..54008c3db 100644
--- a/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go
+++ b/iSolarCloud/AppService/updateHouseholdWorkOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go b/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go
index 9093b1246..6709e237a 100644
--- a/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go
+++ b/iSolarCloud/AppService/updateInverterSn2ModuleSn/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go b/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go
index 05926a087..c004e09b8 100644
--- a/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go
+++ b/iSolarCloud/AppService/updateInverterSn2ModuleSn/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go b/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go
index dea676661..5622afed5 100644
--- a/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go
+++ b/iSolarCloud/AppService/updateOperateTicketAttachmentId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go b/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go
index bbe40062b..135a40b5d 100644
--- a/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go
+++ b/iSolarCloud/AppService/updateOperateTicketAttachmentId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go
index 900e80789..6afdf8aba 100644
--- a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go
+++ b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go
index c03859171..45ba75012 100644
--- a/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go
+++ b/iSolarCloud/AppService/updateOrderDeviceByCustomerService/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateOwnerFaultConfig/data.go b/iSolarCloud/AppService/updateOwnerFaultConfig/data.go
index afac772a2..92e92942e 100644
--- a/iSolarCloud/AppService/updateOwnerFaultConfig/data.go
+++ b/iSolarCloud/AppService/updateOwnerFaultConfig/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go b/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go
index 2c411a008..e80c25d27 100644
--- a/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go
+++ b/iSolarCloud/AppService/updateOwnerFaultConfig/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateParamSettingSysMsg/data.go b/iSolarCloud/AppService/updateParamSettingSysMsg/data.go
index 6b6805bdc..4c8975dc1 100644
--- a/iSolarCloud/AppService/updateParamSettingSysMsg/data.go
+++ b/iSolarCloud/AppService/updateParamSettingSysMsg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go b/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go
index 8b22b1116..d1d6e9d15 100644
--- a/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go
+++ b/iSolarCloud/AppService/updateParamSettingSysMsg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go
index ee58f863f..215518495 100644
--- a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go
+++ b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go
index 33464f44b..28f940261 100644
--- a/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go
+++ b/iSolarCloud/AppService/updatePlatformLevelFaultLevel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerDevicePoint/data.go b/iSolarCloud/AppService/updatePowerDevicePoint/data.go
index 2e37febbb..3b714ba51 100644
--- a/iSolarCloud/AppService/updatePowerDevicePoint/data.go
+++ b/iSolarCloud/AppService/updatePowerDevicePoint/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerDevicePoint/struct.go b/iSolarCloud/AppService/updatePowerDevicePoint/struct.go
index af3535780..ec5ee5635 100644
--- a/iSolarCloud/AppService/updatePowerDevicePoint/struct.go
+++ b/iSolarCloud/AppService/updatePowerDevicePoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerRobotInfo/data.go b/iSolarCloud/AppService/updatePowerRobotInfo/data.go
index dcbae93b0..56c58e3aa 100644
--- a/iSolarCloud/AppService/updatePowerRobotInfo/data.go
+++ b/iSolarCloud/AppService/updatePowerRobotInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerRobotInfo/struct.go b/iSolarCloud/AppService/updatePowerRobotInfo/struct.go
index 5f2e10cfe..23c4ec3e5 100644
--- a/iSolarCloud/AppService/updatePowerRobotInfo/struct.go
+++ b/iSolarCloud/AppService/updatePowerRobotInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go b/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go
index b0df483dc..7c900a494 100644
--- a/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go
+++ b/iSolarCloud/AppService/updatePowerRobotSweepAttr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go b/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go
index 3e2cfbf35..9b25587ab 100644
--- a/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go
+++ b/iSolarCloud/AppService/updatePowerRobotSweepAttr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerStationForHousehold/data.go b/iSolarCloud/AppService/updatePowerStationForHousehold/data.go
index e7d9a002d..0d8cbd995 100644
--- a/iSolarCloud/AppService/updatePowerStationForHousehold/data.go
+++ b/iSolarCloud/AppService/updatePowerStationForHousehold/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go b/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go
index dc854dc09..1ae6e2318 100644
--- a/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go
+++ b/iSolarCloud/AppService/updatePowerStationForHousehold/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerStationInfo/data.go b/iSolarCloud/AppService/updatePowerStationInfo/data.go
index eb704f3f0..9106de5a9 100644
--- a/iSolarCloud/AppService/updatePowerStationInfo/data.go
+++ b/iSolarCloud/AppService/updatePowerStationInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerStationInfo/struct.go b/iSolarCloud/AppService/updatePowerStationInfo/struct.go
index f52a5e193..938ac3286 100644
--- a/iSolarCloud/AppService/updatePowerStationInfo/struct.go
+++ b/iSolarCloud/AppService/updatePowerStationInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updatePowerUserInfo/data.go b/iSolarCloud/AppService/updatePowerUserInfo/data.go
index 6fa1179eb..f8d034c43 100644
--- a/iSolarCloud/AppService/updatePowerUserInfo/data.go
+++ b/iSolarCloud/AppService/updatePowerUserInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updatePowerUserInfo/struct.go b/iSolarCloud/AppService/updatePowerUserInfo/struct.go
index 2475183df..c1c702b81 100644
--- a/iSolarCloud/AppService/updatePowerUserInfo/struct.go
+++ b/iSolarCloud/AppService/updatePowerUserInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go b/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go
index b91412cfb..e6ffba5c6 100644
--- a/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go
+++ b/iSolarCloud/AppService/updateReportConfigByEmailAddr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go b/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go
index a5132ec56..10c41d7c1 100644
--- a/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go
+++ b/iSolarCloud/AppService/updateReportConfigByEmailAddr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateShareAttr/data.go b/iSolarCloud/AppService/updateShareAttr/data.go
index c8f2d78f1..c55de313a 100644
--- a/iSolarCloud/AppService/updateShareAttr/data.go
+++ b/iSolarCloud/AppService/updateShareAttr/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateShareAttr/struct.go b/iSolarCloud/AppService/updateShareAttr/struct.go
index fe3c80b9a..0973afbc2 100644
--- a/iSolarCloud/AppService/updateShareAttr/struct.go
+++ b/iSolarCloud/AppService/updateShareAttr/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateSnIsSureFlag/data.go b/iSolarCloud/AppService/updateSnIsSureFlag/data.go
index 37653a017..a4023b9f5 100644
--- a/iSolarCloud/AppService/updateSnIsSureFlag/data.go
+++ b/iSolarCloud/AppService/updateSnIsSureFlag/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateSnIsSureFlag/struct.go b/iSolarCloud/AppService/updateSnIsSureFlag/struct.go
index 0211a93cf..f6d0d3ffa 100644
--- a/iSolarCloud/AppService/updateSnIsSureFlag/struct.go
+++ b/iSolarCloud/AppService/updateSnIsSureFlag/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateStationPics/data.go b/iSolarCloud/AppService/updateStationPics/data.go
index fb1beed86..80f6aab29 100644
--- a/iSolarCloud/AppService/updateStationPics/data.go
+++ b/iSolarCloud/AppService/updateStationPics/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateStationPics/struct.go b/iSolarCloud/AppService/updateStationPics/struct.go
index f137679c2..0af43df63 100644
--- a/iSolarCloud/AppService/updateStationPics/struct.go
+++ b/iSolarCloud/AppService/updateStationPics/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateSysAdvancedParam/data.go b/iSolarCloud/AppService/updateSysAdvancedParam/data.go
index a46eaeb71..f56271f25 100644
--- a/iSolarCloud/AppService/updateSysAdvancedParam/data.go
+++ b/iSolarCloud/AppService/updateSysAdvancedParam/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateSysAdvancedParam/struct.go b/iSolarCloud/AppService/updateSysAdvancedParam/struct.go
index ce96f568c..611934e68 100644
--- a/iSolarCloud/AppService/updateSysAdvancedParam/struct.go
+++ b/iSolarCloud/AppService/updateSysAdvancedParam/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateSysOrgNew/data.go b/iSolarCloud/AppService/updateSysOrgNew/data.go
index 3de2ca287..0c55be06f 100644
--- a/iSolarCloud/AppService/updateSysOrgNew/data.go
+++ b/iSolarCloud/AppService/updateSysOrgNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateSysOrgNew/struct.go b/iSolarCloud/AppService/updateSysOrgNew/struct.go
index 8cb8e5b2d..59fc94232 100644
--- a/iSolarCloud/AppService/updateSysOrgNew/struct.go
+++ b/iSolarCloud/AppService/updateSysOrgNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateTemplate/data.go b/iSolarCloud/AppService/updateTemplate/data.go
index 7486d7f9d..3f06cbb2b 100644
--- a/iSolarCloud/AppService/updateTemplate/data.go
+++ b/iSolarCloud/AppService/updateTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateTemplate/struct.go b/iSolarCloud/AppService/updateTemplate/struct.go
index c970cb5b2..391c7faae 100644
--- a/iSolarCloud/AppService/updateTemplate/struct.go
+++ b/iSolarCloud/AppService/updateTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go b/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go
index 0520923e7..0284172c7 100644
--- a/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go
+++ b/iSolarCloud/AppService/updateUinfoNetEaseUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go b/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go
index d1b59a0ab..b5703e965 100644
--- a/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go
+++ b/iSolarCloud/AppService/updateUinfoNetEaseUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateUserExtensionAttribute/data.go b/iSolarCloud/AppService/updateUserExtensionAttribute/data.go
index 0ed333627..79e2be449 100644
--- a/iSolarCloud/AppService/updateUserExtensionAttribute/data.go
+++ b/iSolarCloud/AppService/updateUserExtensionAttribute/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go b/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go
index 0354bdaf5..227ec84cc 100644
--- a/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go
+++ b/iSolarCloud/AppService/updateUserExtensionAttribute/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateUserLanguage/data.go b/iSolarCloud/AppService/updateUserLanguage/data.go
index deaa94a1b..218479785 100644
--- a/iSolarCloud/AppService/updateUserLanguage/data.go
+++ b/iSolarCloud/AppService/updateUserLanguage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateUserLanguage/struct.go b/iSolarCloud/AppService/updateUserLanguage/struct.go
index 9291ac9a0..e3a2f30fb 100644
--- a/iSolarCloud/AppService/updateUserLanguage/struct.go
+++ b/iSolarCloud/AppService/updateUserLanguage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateUserPosition/data.go b/iSolarCloud/AppService/updateUserPosition/data.go
index a666be84f..309a164ff 100644
--- a/iSolarCloud/AppService/updateUserPosition/data.go
+++ b/iSolarCloud/AppService/updateUserPosition/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateUserPosition/struct.go b/iSolarCloud/AppService/updateUserPosition/struct.go
index 9c170f84e..6b9dd2995 100644
--- a/iSolarCloud/AppService/updateUserPosition/struct.go
+++ b/iSolarCloud/AppService/updateUserPosition/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/updateUserUpOrg/data.go b/iSolarCloud/AppService/updateUserUpOrg/data.go
index 5eb053105..25f2744b0 100644
--- a/iSolarCloud/AppService/updateUserUpOrg/data.go
+++ b/iSolarCloud/AppService/updateUserUpOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/updateUserUpOrg/struct.go b/iSolarCloud/AppService/updateUserUpOrg/struct.go
index 69442741b..cb0c95add 100644
--- a/iSolarCloud/AppService/updateUserUpOrg/struct.go
+++ b/iSolarCloud/AppService/updateUserUpOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/upgrade/data.go b/iSolarCloud/AppService/upgrade/data.go
index 0dfb61d6e..352628862 100644
--- a/iSolarCloud/AppService/upgrade/data.go
+++ b/iSolarCloud/AppService/upgrade/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/upgrade/struct.go b/iSolarCloud/AppService/upgrade/struct.go
index afc4f3edc..623f13506 100644
--- a/iSolarCloud/AppService/upgrade/struct.go
+++ b/iSolarCloud/AppService/upgrade/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/upgrate/data.go b/iSolarCloud/AppService/upgrate/data.go
index 122120f58..befa0e9e2 100644
--- a/iSolarCloud/AppService/upgrate/data.go
+++ b/iSolarCloud/AppService/upgrate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/upgrate/struct.go b/iSolarCloud/AppService/upgrate/struct.go
index a1c5b5f8a..221942b8b 100644
--- a/iSolarCloud/AppService/upgrate/struct.go
+++ b/iSolarCloud/AppService/upgrate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/uploadFileToOss/data.go b/iSolarCloud/AppService/uploadFileToOss/data.go
index cbe1d8e34..bd3e13d4c 100644
--- a/iSolarCloud/AppService/uploadFileToOss/data.go
+++ b/iSolarCloud/AppService/uploadFileToOss/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/uploadFileToOss/struct.go b/iSolarCloud/AppService/uploadFileToOss/struct.go
index f1ab2adda..91845ea54 100644
--- a/iSolarCloud/AppService/uploadFileToOss/struct.go
+++ b/iSolarCloud/AppService/uploadFileToOss/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/userAgreeGdprProtocol/data.go b/iSolarCloud/AppService/userAgreeGdprProtocol/data.go
index 0ebc8f3a4..e04934994 100644
--- a/iSolarCloud/AppService/userAgreeGdprProtocol/data.go
+++ b/iSolarCloud/AppService/userAgreeGdprProtocol/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go b/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go
index 8551caa59..f3758fb4c 100644
--- a/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go
+++ b/iSolarCloud/AppService/userAgreeGdprProtocol/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/userInfoUniqueCheck/data.go b/iSolarCloud/AppService/userInfoUniqueCheck/data.go
index a2c7cc8e7..456f455e5 100644
--- a/iSolarCloud/AppService/userInfoUniqueCheck/data.go
+++ b/iSolarCloud/AppService/userInfoUniqueCheck/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/userInfoUniqueCheck/struct.go b/iSolarCloud/AppService/userInfoUniqueCheck/struct.go
index 4013e7a34..870394515 100644
--- a/iSolarCloud/AppService/userInfoUniqueCheck/struct.go
+++ b/iSolarCloud/AppService/userInfoUniqueCheck/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/userMailHasBound/data.go b/iSolarCloud/AppService/userMailHasBound/data.go
index 1a521db79..e26b9fdb3 100644
--- a/iSolarCloud/AppService/userMailHasBound/data.go
+++ b/iSolarCloud/AppService/userMailHasBound/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/userMailHasBound/struct.go b/iSolarCloud/AppService/userMailHasBound/struct.go
index 77131a35d..6492dd277 100644
--- a/iSolarCloud/AppService/userMailHasBound/struct.go
+++ b/iSolarCloud/AppService/userMailHasBound/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/AppService/userRegister/data.go b/iSolarCloud/AppService/userRegister/data.go
index 2b8c2e700..fc71814d9 100644
--- a/iSolarCloud/AppService/userRegister/data.go
+++ b/iSolarCloud/AppService/userRegister/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/AppService/userRegister/struct.go b/iSolarCloud/AppService/userRegister/struct.go
index c303d9c76..a1c7992da 100644
--- a/iSolarCloud/AppService/userRegister/struct.go
+++ b/iSolarCloud/AppService/userRegister/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/Common/invalid.go b/iSolarCloud/Common/invalid.go
new file mode 100644
index 000000000..9ef83ea64
--- /dev/null
+++ b/iSolarCloud/Common/invalid.go
@@ -0,0 +1,10 @@
+package Common
+
+type Unknown interface{}
+
+type UnknownStruct struct {
+}
+
+type UnknownArray []interface{}
+
+type UnknownMap map[string]interface{}
diff --git a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go
index ac719d077..f58005910 100644
--- a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go
+++ b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go
index 894b91156..403df8602 100644
--- a/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go
+++ b/iSolarCloud/MttvScreenService/accumEnergyPsKpiData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/addBuildProgressing/data.go b/iSolarCloud/MttvScreenService/addBuildProgressing/data.go
index 1bf0f051c..5f7f1e5b9 100644
--- a/iSolarCloud/MttvScreenService/addBuildProgressing/data.go
+++ b/iSolarCloud/MttvScreenService/addBuildProgressing/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go
index 2154c191b..6a68e52f2 100644
--- a/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go
+++ b/iSolarCloud/MttvScreenService/addBuildProgressing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go b/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go
index 515c42207..99e9d8568 100644
--- a/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go
+++ b/iSolarCloud/MttvScreenService/deleteBuildProgressing/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go
index ce97d8614..f81dfde24 100644
--- a/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go
+++ b/iSolarCloud/MttvScreenService/deleteBuildProgressing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go
index 1886deafb..dab2b2532 100644
--- a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go
+++ b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/data.go
@@ -3,9 +3,8 @@ package energyEquivalentHoursRanking
import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
- "GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/powerStationService/energyEquivalentHoursRanking"
@@ -25,8 +24,8 @@ func (rd RequestData) Help() string {
}
-type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+type ResultData struct {
+ Result []interface{} `json:"result"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +33,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go
index f35ed02ff..551432b38 100644
--- a/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go
+++ b/iSolarCloud/MttvScreenService/energyEquivalentHoursRanking/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go b/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go
index 8b86f91be..23506593a 100644
--- a/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go
+++ b/iSolarCloud/MttvScreenService/energyGetRankBySortName/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go b/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go
index b9782c854..cb42b7d79 100644
--- a/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go
+++ b/iSolarCloud/MttvScreenService/energyGetRankBySortName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go
index c44718e09..1b11abdc1 100644
--- a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go
+++ b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go
index dbdc291f7..56fe07122 100644
--- a/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go
+++ b/iSolarCloud/MttvScreenService/energyPovertyAlleviation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go
index e960b181d..98d5a74a6 100644
--- a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go
+++ b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/data.go
@@ -3,9 +3,8 @@ package energyPowerGenerationTrends
import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
- "GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/orgService/energyPowerGenerationTrends"
@@ -25,8 +24,8 @@ func (rd RequestData) Help() string {
}
-type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+type ResultData struct {
+ KpiList []interface{} `json:"kpiList"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +33,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go
index d82fd215d..2493d3967 100644
--- a/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go
+++ b/iSolarCloud/MttvScreenService/energyPowerGenerationTrends/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/findSingleStationPR/data.go b/iSolarCloud/MttvScreenService/findSingleStationPR/data.go
index 2af3cc3f7..05f139212 100644
--- a/iSolarCloud/MttvScreenService/findSingleStationPR/data.go
+++ b/iSolarCloud/MttvScreenService/findSingleStationPR/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go b/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go
index 478a49683..ff9895748 100644
--- a/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go
+++ b/iSolarCloud/MttvScreenService/findSingleStationPR/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go b/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go
index 2004570e7..4c3f23ade 100644
--- a/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go
+++ b/iSolarCloud/MttvScreenService/getCapabilityTrend/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go b/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go
index 0c6fc5f96..004e670e7 100644
--- a/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go
+++ b/iSolarCloud/MttvScreenService/getCapabilityTrend/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go
index 6535a9d01..59c0a9ef4 100644
--- a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go
+++ b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go
index 94cc689f5..2da132d19 100644
--- a/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go
+++ b/iSolarCloud/MttvScreenService/getKpiByUserIdAndAreaCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getMapByUser/data.go b/iSolarCloud/MttvScreenService/getMapByUser/data.go
index 294aa8df1..e5a125961 100644
--- a/iSolarCloud/MttvScreenService/getMapByUser/data.go
+++ b/iSolarCloud/MttvScreenService/getMapByUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getMapByUser/struct.go b/iSolarCloud/MttvScreenService/getMapByUser/struct.go
index 4ca00f8a4..64df7833a 100644
--- a/iSolarCloud/MttvScreenService/getMapByUser/struct.go
+++ b/iSolarCloud/MttvScreenService/getMapByUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go b/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go
index 549d225d8..d15d6d188 100644
--- a/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go
+++ b/iSolarCloud/MttvScreenService/getOrgProByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go b/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go
index 24f184412..10b01ab23 100644
--- a/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go
+++ b/iSolarCloud/MttvScreenService/getOrgProByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go b/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go
index 7e0e1d219..627dee74b 100644
--- a/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go
+++ b/iSolarCloud/MttvScreenService/getPlanAndActualPower/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go b/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go
index a96b882b2..e32fd230f 100644
--- a/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go
+++ b/iSolarCloud/MttvScreenService/getPlanAndActualPower/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go b/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go
index bf7c9d079..5548f5179 100644
--- a/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go
+++ b/iSolarCloud/MttvScreenService/getPsDeviceListValue/data.go
@@ -4,15 +4,15 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/powerStationService/getPsDeviceListValue"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
+ PsId valueTypes.PsId `json:"ps_id" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -24,9 +24,29 @@ func (rd RequestData) Help() string {
return ret
}
-
type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+ List []struct {
+ AttrID valueTypes.Integer `json:"attr_id"`
+ ComponentAmount valueTypes.Integer `json:"component_amount"`
+ DevFaultStatus valueTypes.Integer `json:"dev_fault_status"`
+ DevStatus valueTypes.Integer `json:"dev_status"`
+ DeviceID valueTypes.Integer `json:"device_id"`
+ DeviceName valueTypes.String `json:"device_name"`
+ DeviceStatus valueTypes.String `json:"device_status"`
+ DeviceType valueTypes.Integer `json:"device_type"`
+ Id valueTypes.Integer `json:"id"`
+ InstallerDevFaultStatus valueTypes.Integer `json:"installer_dev_fault_status"`
+ OrderId valueTypes.Integer `json:"orderid" PointId:"order_id"`
+ OwnerDevFaultStatus valueTypes.Integer `json:"owner_dev_fault_status"`
+ Posx interface{} `json:"posx"`
+ Posy interface{} `json:"posy"`
+ PsId valueTypes.Integer `json:"ps_id"`
+ PsKey valueTypes.String `json:"pskey" PointId:"ps_key"`
+ StringAmount valueTypes.Integer `json:"string_amount"`
+ UpUUID valueTypes.Integer `json:"up_uuid"`
+ UUID valueTypes.Integer `json:"uuid"`
+ UUIDIndexCode valueTypes.String `json:"uuid_index_code"`
+ } `json:"list" PointIdFromChild:"PsId.PsKey" PointIdReplace:"true"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +54,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go b/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go
index b0f22e2ea..b409f9ae7 100644
--- a/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go
+++ b/iSolarCloud/MttvScreenService/getPsDeviceListValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go
index 2ebe41d23..61a357e5f 100644
--- a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go
+++ b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go
index 6d4156356..1830e1a97 100644
--- a/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go
+++ b/iSolarCloud/MttvScreenService/getPsInfoWithJoinGridByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go
index 1085d508a..76934761c 100644
--- a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go
+++ b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/data.go
@@ -4,15 +4,16 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/powerStationService/getPsKpiForHoursByPsId"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
+ PsId valueTypes.PsId `json:"ps_id" required:"true"`
+ Day valueTypes.DateTime `json:"day" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -26,7 +27,15 @@ func (rd RequestData) Help() string {
type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+ Hours map[string]Hour `json:"hours"`
+}
+type Hour struct {
+ CurrPower float64 `json:"curr_power"`
+ CurrPowerUnit valueTypes.String `json:"curr_power_unit"`
+ CurrRadiation valueTypes.Integer `json:"curr_radiation"`
+ CurrRadiationUnit valueTypes.String `json:"curr_radiation_unit"`
+ TodayEnergy valueTypes.Integer `json:"today_energy"`
+ TodayEnergyUnit valueTypes.String `json:"today_energy_unit"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +43,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go
index 55edbd342..8ceca1439 100644
--- a/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go
+++ b/iSolarCloud/MttvScreenService/getPsKpiForHoursByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPsListByMapId/data.go b/iSolarCloud/MttvScreenService/getPsListByMapId/data.go
index 573950179..250f53db9 100644
--- a/iSolarCloud/MttvScreenService/getPsListByMapId/data.go
+++ b/iSolarCloud/MttvScreenService/getPsListByMapId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go b/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go
index ed8d1c7fc..572d4ef41 100644
--- a/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go
+++ b/iSolarCloud/MttvScreenService/getPsListByMapId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go
index 590002c4b..6051fe253 100644
--- a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go
+++ b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go
index 45ef3ea9f..a6083ce51 100644
--- a/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go
+++ b/iSolarCloud/MttvScreenService/getPsListByUserIdAndAreaCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go
index 389cb632c..f0825f095 100644
--- a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go
+++ b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/data.go
@@ -4,15 +4,16 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/powerStationService/getTheoryAndActualPower"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
+ // ws.missing-parameter:user_id or ps_id
+ PsId valueTypes.PsId `json:"ps_id" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -34,30 +35,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go
index 7bfaf4b6c..554a94e30 100644
--- a/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go
+++ b/iSolarCloud/MttvScreenService/getTheoryAndActualPower/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go b/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go
index f75f8912c..e523ec4f9 100644
--- a/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go
+++ b/iSolarCloud/MttvScreenService/nextLevelOrgList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go b/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go
index e6d25a4c7..ece73b403 100644
--- a/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go
+++ b/iSolarCloud/MttvScreenService/nextLevelOrgList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go
index 964fa2258..c9f01bf3f 100644
--- a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go
+++ b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go
index 21a8ddef3..997905643 100644
--- a/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go
+++ b/iSolarCloud/MttvScreenService/nextLevelOrgStatisticalDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/orgPowerReport/data.go b/iSolarCloud/MttvScreenService/orgPowerReport/data.go
index 5f9742b05..c6c05173f 100644
--- a/iSolarCloud/MttvScreenService/orgPowerReport/data.go
+++ b/iSolarCloud/MttvScreenService/orgPowerReport/data.go
@@ -4,15 +4,15 @@ import (
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "github.com/MickMake/GoUnify/Only"
"fmt"
+ "github.com/MickMake/GoUnify/Only"
)
const Url = "/v1/orgService/orgPowerReport"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
+ Type valueTypes.Integer `json:"type" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -25,8 +25,8 @@ func (rd RequestData) Help() string {
}
-type ResultData struct {
- Dummy valueTypes.String `json:"dummy"`
+type ResultData struct {
+ RespMsg valueTypes.String `json:"respMsg" PointId:"resp_msg"`
}
func (e *ResultData) IsValid() error {
@@ -34,30 +34,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/orgPowerReport/struct.go b/iSolarCloud/MttvScreenService/orgPowerReport/struct.go
index 83ddaaa3c..ebbc5a015 100644
--- a/iSolarCloud/MttvScreenService/orgPowerReport/struct.go
+++ b/iSolarCloud/MttvScreenService/orgPowerReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go
index 41cfb4b54..446945474 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressing/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go
index 68a484883..729fb394d 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go
index 424287ea6..56bfb1b60 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go
index a21c09af3..c4988c9b9 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressingNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go
index 0ff041e64..87a58ac30 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go
index f01963c1a..de5bfd80f 100644
--- a/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go
+++ b/iSolarCloud/MttvScreenService/queryBuildProgressingOne/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go
index ea6b2155e..178351fa8 100644
--- a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go
+++ b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go
index 0af6114f8..39ba7624b 100644
--- a/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go
+++ b/iSolarCloud/MttvScreenService/queryNearlyTwoYearsGenAndPrft/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go
index 249728fea..bec2fd047 100644
--- a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go
+++ b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go
index f3f548ea0..90a89286c 100644
--- a/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go
+++ b/iSolarCloud/MttvScreenService/querySaveEnergyPsSOH/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go
index 38b88516e..bd0344c97 100644
--- a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go
+++ b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go
index 7188a544e..11aba8012 100644
--- a/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go
+++ b/iSolarCloud/MttvScreenService/queryScreenUserMdIfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go
index b1b71d095..ba4de3dd1 100644
--- a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go
+++ b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go
index 0657c55a8..dbf61ca8a 100644
--- a/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go
+++ b/iSolarCloud/MttvScreenService/saveOrUpdatePosition/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go b/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go
index d7a944d5e..89ef5450d 100644
--- a/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go
+++ b/iSolarCloud/MttvScreenService/updateBuildProgressing/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go b/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go
index 1ce64f45d..e27e2ec0b 100644
--- a/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go
+++ b/iSolarCloud/MttvScreenService/updateBuildProgressing/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/NullArea/NullEndpoint/data.go b/iSolarCloud/NullArea/NullEndpoint/data.go
index 680bc4ea7..fe48db245 100644
--- a/iSolarCloud/NullArea/NullEndpoint/data.go
+++ b/iSolarCloud/NullArea/NullEndpoint/data.go
@@ -42,7 +42,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/NullArea/NullEndpoint/struct.go b/iSolarCloud/NullArea/NullEndpoint/struct.go
index ccd78a7fd..c8d4f1c17 100644
--- a/iSolarCloud/NullArea/NullEndpoint/struct.go
+++ b/iSolarCloud/NullArea/NullEndpoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go b/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go
index f0b770a98..362bf65a9 100644
--- a/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go
+++ b/iSolarCloud/PowerPointService/queryPointDataTopOne/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go b/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go
index 2bdb4d745..f057f9221 100644
--- a/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go
+++ b/iSolarCloud/PowerPointService/queryPointDataTopOne/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/addMaterial/data.go b/iSolarCloud/WebAppService/addMaterial/data.go
index c4128547b..493fabfd3 100644
--- a/iSolarCloud/WebAppService/addMaterial/data.go
+++ b/iSolarCloud/WebAppService/addMaterial/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/addMaterial/struct.go b/iSolarCloud/WebAppService/addMaterial/struct.go
index 878d00abe..1dc192de9 100644
--- a/iSolarCloud/WebAppService/addMaterial/struct.go
+++ b/iSolarCloud/WebAppService/addMaterial/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/addOptTicketInfo/data.go b/iSolarCloud/WebAppService/addOptTicketInfo/data.go
index ecd8d2b1f..5ebd03c84 100644
--- a/iSolarCloud/WebAppService/addOptTicketInfo/data.go
+++ b/iSolarCloud/WebAppService/addOptTicketInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/addOptTicketInfo/struct.go b/iSolarCloud/WebAppService/addOptTicketInfo/struct.go
index ef34ca77c..eb814dcef 100644
--- a/iSolarCloud/WebAppService/addOptTicketInfo/struct.go
+++ b/iSolarCloud/WebAppService/addOptTicketInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/addSpareParts/data.go b/iSolarCloud/WebAppService/addSpareParts/data.go
index 77dce9756..60dc27374 100644
--- a/iSolarCloud/WebAppService/addSpareParts/data.go
+++ b/iSolarCloud/WebAppService/addSpareParts/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/addSpareParts/struct.go b/iSolarCloud/WebAppService/addSpareParts/struct.go
index a400bc3bd..53314bba0 100644
--- a/iSolarCloud/WebAppService/addSpareParts/struct.go
+++ b/iSolarCloud/WebAppService/addSpareParts/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/associateQueryFaultNames/data.go b/iSolarCloud/WebAppService/associateQueryFaultNames/data.go
index fe4d15bab..76dbdc794 100644
--- a/iSolarCloud/WebAppService/associateQueryFaultNames/data.go
+++ b/iSolarCloud/WebAppService/associateQueryFaultNames/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go b/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go
index d168dcabf..b4f7af412 100644
--- a/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go
+++ b/iSolarCloud/WebAppService/associateQueryFaultNames/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go b/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go
index cc8183557..b5b19f749 100644
--- a/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go
+++ b/iSolarCloud/WebAppService/auditPsDeviceCheck/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go b/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go
index 3d70defaf..a99069bc0 100644
--- a/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go
+++ b/iSolarCloud/WebAppService/auditPsDeviceCheck/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/calcOutputRankByDay/data.go b/iSolarCloud/WebAppService/calcOutputRankByDay/data.go
index 75569cadd..b8d62ffeb 100644
--- a/iSolarCloud/WebAppService/calcOutputRankByDay/data.go
+++ b/iSolarCloud/WebAppService/calcOutputRankByDay/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go b/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go
index a1c41ad0e..3cd90d380 100644
--- a/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go
+++ b/iSolarCloud/WebAppService/calcOutputRankByDay/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/changeReadStatus/data.go b/iSolarCloud/WebAppService/changeReadStatus/data.go
index cfef9def2..e4137c57f 100644
--- a/iSolarCloud/WebAppService/changeReadStatus/data.go
+++ b/iSolarCloud/WebAppService/changeReadStatus/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/changeReadStatus/struct.go b/iSolarCloud/WebAppService/changeReadStatus/struct.go
index b5cb1746a..05709f029 100644
--- a/iSolarCloud/WebAppService/changeReadStatus/struct.go
+++ b/iSolarCloud/WebAppService/changeReadStatus/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/checkMaterialName/data.go b/iSolarCloud/WebAppService/checkMaterialName/data.go
index 33b472e14..048418316 100644
--- a/iSolarCloud/WebAppService/checkMaterialName/data.go
+++ b/iSolarCloud/WebAppService/checkMaterialName/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/checkMaterialName/struct.go b/iSolarCloud/WebAppService/checkMaterialName/struct.go
index f1f2107b4..afd7f7964 100644
--- a/iSolarCloud/WebAppService/checkMaterialName/struct.go
+++ b/iSolarCloud/WebAppService/checkMaterialName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/confirmFault/data.go b/iSolarCloud/WebAppService/confirmFault/data.go
index 74b943a9b..82397f632 100644
--- a/iSolarCloud/WebAppService/confirmFault/data.go
+++ b/iSolarCloud/WebAppService/confirmFault/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/confirmFault/struct.go b/iSolarCloud/WebAppService/confirmFault/struct.go
index 832a15ea0..4d8bedb63 100644
--- a/iSolarCloud/WebAppService/confirmFault/struct.go
+++ b/iSolarCloud/WebAppService/confirmFault/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/copeOperateTicket/data.go b/iSolarCloud/WebAppService/copeOperateTicket/data.go
index bdf1ad767..3293259d3 100644
--- a/iSolarCloud/WebAppService/copeOperateTicket/data.go
+++ b/iSolarCloud/WebAppService/copeOperateTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/copeOperateTicket/struct.go b/iSolarCloud/WebAppService/copeOperateTicket/struct.go
index b6208d8f5..fc409b210 100644
--- a/iSolarCloud/WebAppService/copeOperateTicket/struct.go
+++ b/iSolarCloud/WebAppService/copeOperateTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/copySecondTypeTicket/data.go b/iSolarCloud/WebAppService/copySecondTypeTicket/data.go
index e24ddbdc7..22f807980 100644
--- a/iSolarCloud/WebAppService/copySecondTypeTicket/data.go
+++ b/iSolarCloud/WebAppService/copySecondTypeTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go b/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go
index 73f510f06..8d22154d2 100644
--- a/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go
+++ b/iSolarCloud/WebAppService/copySecondTypeTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/copyWorkTicket/data.go b/iSolarCloud/WebAppService/copyWorkTicket/data.go
index 44ada79be..3addc43d3 100644
--- a/iSolarCloud/WebAppService/copyWorkTicket/data.go
+++ b/iSolarCloud/WebAppService/copyWorkTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/copyWorkTicket/struct.go b/iSolarCloud/WebAppService/copyWorkTicket/struct.go
index edea2836f..e5383a528 100644
--- a/iSolarCloud/WebAppService/copyWorkTicket/struct.go
+++ b/iSolarCloud/WebAppService/copyWorkTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/delOptTicketInfo/data.go b/iSolarCloud/WebAppService/delOptTicketInfo/data.go
index 2de0b04e7..97bbbeb97 100644
--- a/iSolarCloud/WebAppService/delOptTicketInfo/data.go
+++ b/iSolarCloud/WebAppService/delOptTicketInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/delOptTicketInfo/struct.go b/iSolarCloud/WebAppService/delOptTicketInfo/struct.go
index b6e250c64..364a8c91d 100644
--- a/iSolarCloud/WebAppService/delOptTicketInfo/struct.go
+++ b/iSolarCloud/WebAppService/delOptTicketInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteDuty/data.go b/iSolarCloud/WebAppService/deleteDuty/data.go
index d2237a48d..3d40db34a 100644
--- a/iSolarCloud/WebAppService/deleteDuty/data.go
+++ b/iSolarCloud/WebAppService/deleteDuty/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteDuty/struct.go b/iSolarCloud/WebAppService/deleteDuty/struct.go
index 4af65a1de..8a1c45031 100644
--- a/iSolarCloud/WebAppService/deleteDuty/struct.go
+++ b/iSolarCloud/WebAppService/deleteDuty/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteDutyMid/data.go b/iSolarCloud/WebAppService/deleteDutyMid/data.go
index 66e5366d1..79923e055 100644
--- a/iSolarCloud/WebAppService/deleteDutyMid/data.go
+++ b/iSolarCloud/WebAppService/deleteDutyMid/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteDutyMid/struct.go b/iSolarCloud/WebAppService/deleteDutyMid/struct.go
index 19c148745..890e25d66 100644
--- a/iSolarCloud/WebAppService/deleteDutyMid/struct.go
+++ b/iSolarCloud/WebAppService/deleteDutyMid/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteMaterial/data.go b/iSolarCloud/WebAppService/deleteMaterial/data.go
index 54e1dd711..49dc60e32 100644
--- a/iSolarCloud/WebAppService/deleteMaterial/data.go
+++ b/iSolarCloud/WebAppService/deleteMaterial/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteMaterial/struct.go b/iSolarCloud/WebAppService/deleteMaterial/struct.go
index 575868ee0..6f68a69ad 100644
--- a/iSolarCloud/WebAppService/deleteMaterial/struct.go
+++ b/iSolarCloud/WebAppService/deleteMaterial/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go
index e6b395177..a4c2d3175 100644
--- a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go
+++ b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go
index 1796be019..1e3e26e0f 100644
--- a/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go
+++ b/iSolarCloud/WebAppService/deleteOrSharedSelfReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go b/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go
index c73337eb5..7f4b5f8fb 100644
--- a/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go
+++ b/iSolarCloud/WebAppService/deleteSecondTypeTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go b/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go
index f047f6231..51120fd89 100644
--- a/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go
+++ b/iSolarCloud/WebAppService/deleteSecondTypeTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteSparePartsById/data.go b/iSolarCloud/WebAppService/deleteSparePartsById/data.go
index 3052af32b..2327f7b3f 100644
--- a/iSolarCloud/WebAppService/deleteSparePartsById/data.go
+++ b/iSolarCloud/WebAppService/deleteSparePartsById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteSparePartsById/struct.go b/iSolarCloud/WebAppService/deleteSparePartsById/struct.go
index 312099ba9..1b3411c3f 100644
--- a/iSolarCloud/WebAppService/deleteSparePartsById/struct.go
+++ b/iSolarCloud/WebAppService/deleteSparePartsById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deleteWorkTicket/data.go b/iSolarCloud/WebAppService/deleteWorkTicket/data.go
index a5ec9edf9..998145cf7 100644
--- a/iSolarCloud/WebAppService/deleteWorkTicket/data.go
+++ b/iSolarCloud/WebAppService/deleteWorkTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deleteWorkTicket/struct.go b/iSolarCloud/WebAppService/deleteWorkTicket/struct.go
index 4a348f6d7..cfa966484 100644
--- a/iSolarCloud/WebAppService/deleteWorkTicket/struct.go
+++ b/iSolarCloud/WebAppService/deleteWorkTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/deviceFactoryList/data.go b/iSolarCloud/WebAppService/deviceFactoryList/data.go
index 8dd76b290..3720ef9f3 100644
--- a/iSolarCloud/WebAppService/deviceFactoryList/data.go
+++ b/iSolarCloud/WebAppService/deviceFactoryList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/deviceFactoryList/struct.go b/iSolarCloud/WebAppService/deviceFactoryList/struct.go
index 58b5b0b5b..1da344680 100644
--- a/iSolarCloud/WebAppService/deviceFactoryList/struct.go
+++ b/iSolarCloud/WebAppService/deviceFactoryList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/dispartDataPageList/data.go b/iSolarCloud/WebAppService/dispartDataPageList/data.go
index 1eca4bb55..14a93e6a4 100644
--- a/iSolarCloud/WebAppService/dispartDataPageList/data.go
+++ b/iSolarCloud/WebAppService/dispartDataPageList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/dispartDataPageList/struct.go b/iSolarCloud/WebAppService/dispartDataPageList/struct.go
index e23f41bd3..a2b16eb5f 100644
--- a/iSolarCloud/WebAppService/dispartDataPageList/struct.go
+++ b/iSolarCloud/WebAppService/dispartDataPageList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/executeTask/data.go b/iSolarCloud/WebAppService/executeTask/data.go
index 2e141681b..135ac8869 100644
--- a/iSolarCloud/WebAppService/executeTask/data.go
+++ b/iSolarCloud/WebAppService/executeTask/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/executeTask/struct.go b/iSolarCloud/WebAppService/executeTask/struct.go
index c0a57dbef..d1b18dfd1 100644
--- a/iSolarCloud/WebAppService/executeTask/struct.go
+++ b/iSolarCloud/WebAppService/executeTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findCurrentTask/data.go b/iSolarCloud/WebAppService/findCurrentTask/data.go
index 01ae27675..34503ec2b 100644
--- a/iSolarCloud/WebAppService/findCurrentTask/data.go
+++ b/iSolarCloud/WebAppService/findCurrentTask/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findCurrentTask/struct.go b/iSolarCloud/WebAppService/findCurrentTask/struct.go
index b90a9745c..e1e986ed5 100644
--- a/iSolarCloud/WebAppService/findCurrentTask/struct.go
+++ b/iSolarCloud/WebAppService/findCurrentTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go b/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go
index 24913a1c3..18fec6850 100644
--- a/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go
+++ b/iSolarCloud/WebAppService/findDeviceMessageByPskey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go b/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go
index 407e131b0..641e63b60 100644
--- a/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go
+++ b/iSolarCloud/WebAppService/findDeviceMessageByPskey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findFactoryMessage/data.go b/iSolarCloud/WebAppService/findFactoryMessage/data.go
index 3610eeab2..86f26b055 100644
--- a/iSolarCloud/WebAppService/findFactoryMessage/data.go
+++ b/iSolarCloud/WebAppService/findFactoryMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findFactoryMessage/struct.go b/iSolarCloud/WebAppService/findFactoryMessage/struct.go
index cc4ad37a6..9b656a34c 100644
--- a/iSolarCloud/WebAppService/findFactoryMessage/struct.go
+++ b/iSolarCloud/WebAppService/findFactoryMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findImgResources/data.go b/iSolarCloud/WebAppService/findImgResources/data.go
index c27f4267f..7a46c065e 100644
--- a/iSolarCloud/WebAppService/findImgResources/data.go
+++ b/iSolarCloud/WebAppService/findImgResources/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findImgResources/struct.go b/iSolarCloud/WebAppService/findImgResources/struct.go
index 990351323..8b9b6a130 100644
--- a/iSolarCloud/WebAppService/findImgResources/struct.go
+++ b/iSolarCloud/WebAppService/findImgResources/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findMateiralSubType/data.go b/iSolarCloud/WebAppService/findMateiralSubType/data.go
index ac9b07607..26203088e 100644
--- a/iSolarCloud/WebAppService/findMateiralSubType/data.go
+++ b/iSolarCloud/WebAppService/findMateiralSubType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findMateiralSubType/struct.go b/iSolarCloud/WebAppService/findMateiralSubType/struct.go
index b58b35e95..9b72767c1 100644
--- a/iSolarCloud/WebAppService/findMateiralSubType/struct.go
+++ b/iSolarCloud/WebAppService/findMateiralSubType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findMaterialById/data.go b/iSolarCloud/WebAppService/findMaterialById/data.go
index 121a70792..8bbc3d13c 100644
--- a/iSolarCloud/WebAppService/findMaterialById/data.go
+++ b/iSolarCloud/WebAppService/findMaterialById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findMaterialById/struct.go b/iSolarCloud/WebAppService/findMaterialById/struct.go
index 88023cef7..8ef1d3ca8 100644
--- a/iSolarCloud/WebAppService/findMaterialById/struct.go
+++ b/iSolarCloud/WebAppService/findMaterialById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go b/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go
index 2a19af370..ec33c24ff 100644
--- a/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go
+++ b/iSolarCloud/WebAppService/findMyDealedCurrentTask/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go b/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go
index 14537b642..81bcf9635 100644
--- a/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go
+++ b/iSolarCloud/WebAppService/findMyDealedCurrentTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findMyDealedImgResources/data.go b/iSolarCloud/WebAppService/findMyDealedImgResources/data.go
index ceef94792..157f4b29a 100644
--- a/iSolarCloud/WebAppService/findMyDealedImgResources/data.go
+++ b/iSolarCloud/WebAppService/findMyDealedImgResources/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go b/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go
index b1facd5cb..ee885d95f 100644
--- a/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go
+++ b/iSolarCloud/WebAppService/findMyDealedImgResources/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findSeriesInverterData/data.go b/iSolarCloud/WebAppService/findSeriesInverterData/data.go
index 7e698909c..39dc4b740 100644
--- a/iSolarCloud/WebAppService/findSeriesInverterData/data.go
+++ b/iSolarCloud/WebAppService/findSeriesInverterData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findSeriesInverterData/struct.go b/iSolarCloud/WebAppService/findSeriesInverterData/struct.go
index f89747281..dc86b58a0 100644
--- a/iSolarCloud/WebAppService/findSeriesInverterData/struct.go
+++ b/iSolarCloud/WebAppService/findSeriesInverterData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/findWebRole/data.go b/iSolarCloud/WebAppService/findWebRole/data.go
index b5f15fb2d..f648b8452 100644
--- a/iSolarCloud/WebAppService/findWebRole/data.go
+++ b/iSolarCloud/WebAppService/findWebRole/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/findWebRole/struct.go b/iSolarCloud/WebAppService/findWebRole/struct.go
index ad08e55dd..f3d8ad5c5 100644
--- a/iSolarCloud/WebAppService/findWebRole/struct.go
+++ b/iSolarCloud/WebAppService/findWebRole/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getAllPsFaultCount/data.go b/iSolarCloud/WebAppService/getAllPsFaultCount/data.go
index 5d67ae4c1..9d6e7e8f6 100644
--- a/iSolarCloud/WebAppService/getAllPsFaultCount/data.go
+++ b/iSolarCloud/WebAppService/getAllPsFaultCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go b/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go
index df17b104c..5a28fb8b6 100644
--- a/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go
+++ b/iSolarCloud/WebAppService/getAllPsFaultCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go
index 61a06f84a..108921710 100644
--- a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go
+++ b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go
index 1002e4e06..6abea5bdb 100644
--- a/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go
+++ b/iSolarCloud/WebAppService/getAllPsFaultCountByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getAllPsList/data.go b/iSolarCloud/WebAppService/getAllPsList/data.go
index e1cd0299b..065b7d4aa 100644
--- a/iSolarCloud/WebAppService/getAllPsList/data.go
+++ b/iSolarCloud/WebAppService/getAllPsList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getAllPsList/struct.go b/iSolarCloud/WebAppService/getAllPsList/struct.go
index 7064c5622..a742297c7 100644
--- a/iSolarCloud/WebAppService/getAllPsList/struct.go
+++ b/iSolarCloud/WebAppService/getAllPsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getAllStore/data.go b/iSolarCloud/WebAppService/getAllStore/data.go
index ff7be3325..0ceba8b38 100644
--- a/iSolarCloud/WebAppService/getAllStore/data.go
+++ b/iSolarCloud/WebAppService/getAllStore/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getAllStore/struct.go b/iSolarCloud/WebAppService/getAllStore/struct.go
index 3cab1ad09..a1490a2a5 100644
--- a/iSolarCloud/WebAppService/getAllStore/struct.go
+++ b/iSolarCloud/WebAppService/getAllStore/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go b/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go
index b6a32651b..d55118aae 100644
--- a/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go
+++ b/iSolarCloud/WebAppService/getBaseDeviceInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go b/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go
index b228178df..36bddb6ad 100644
--- a/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go
+++ b/iSolarCloud/WebAppService/getBaseDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getBoxData/data.go b/iSolarCloud/WebAppService/getBoxData/data.go
index d183faea8..eb47a9514 100644
--- a/iSolarCloud/WebAppService/getBoxData/data.go
+++ b/iSolarCloud/WebAppService/getBoxData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getBoxData/struct.go b/iSolarCloud/WebAppService/getBoxData/struct.go
index c28803b54..57af34df4 100644
--- a/iSolarCloud/WebAppService/getBoxData/struct.go
+++ b/iSolarCloud/WebAppService/getBoxData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getCBoxTree/data.go b/iSolarCloud/WebAppService/getCBoxTree/data.go
index 9b7ec999c..9e1aaf8db 100644
--- a/iSolarCloud/WebAppService/getCBoxTree/data.go
+++ b/iSolarCloud/WebAppService/getCBoxTree/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getCBoxTree/struct.go b/iSolarCloud/WebAppService/getCBoxTree/struct.go
index cd3f4f2aa..729ed59ac 100644
--- a/iSolarCloud/WebAppService/getCBoxTree/struct.go
+++ b/iSolarCloud/WebAppService/getCBoxTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getCheckDevTypeList/data.go b/iSolarCloud/WebAppService/getCheckDevTypeList/data.go
index 580a3f663..10f10898a 100644
--- a/iSolarCloud/WebAppService/getCheckDevTypeList/data.go
+++ b/iSolarCloud/WebAppService/getCheckDevTypeList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go b/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go
index 7b2538901..b2f09965f 100644
--- a/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go
+++ b/iSolarCloud/WebAppService/getCheckDevTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getCheckUserList/data.go b/iSolarCloud/WebAppService/getCheckUserList/data.go
index 59ce9b7a5..947f6b8a5 100644
--- a/iSolarCloud/WebAppService/getCheckUserList/data.go
+++ b/iSolarCloud/WebAppService/getCheckUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getCheckUserList/struct.go b/iSolarCloud/WebAppService/getCheckUserList/struct.go
index ecfffc5fe..64619b58e 100644
--- a/iSolarCloud/WebAppService/getCheckUserList/struct.go
+++ b/iSolarCloud/WebAppService/getCheckUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getChildOrg/data.go b/iSolarCloud/WebAppService/getChildOrg/data.go
index 3c7f9ec30..46277e0db 100644
--- a/iSolarCloud/WebAppService/getChildOrg/data.go
+++ b/iSolarCloud/WebAppService/getChildOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getChildOrg/struct.go b/iSolarCloud/WebAppService/getChildOrg/struct.go
index 321be140f..d8ce5c7d4 100644
--- a/iSolarCloud/WebAppService/getChildOrg/struct.go
+++ b/iSolarCloud/WebAppService/getChildOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getCo/data.go b/iSolarCloud/WebAppService/getCo/data.go
index a88035526..5f608a050 100644
--- a/iSolarCloud/WebAppService/getCo/data.go
+++ b/iSolarCloud/WebAppService/getCo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getCo/struct.go b/iSolarCloud/WebAppService/getCo/struct.go
index 1bc556aa4..fd57f5e50 100644
--- a/iSolarCloud/WebAppService/getCo/struct.go
+++ b/iSolarCloud/WebAppService/getCo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getCodeTreeMap/data.go b/iSolarCloud/WebAppService/getCodeTreeMap/data.go
index 1ffe25daf..623ba99b6 100644
--- a/iSolarCloud/WebAppService/getCodeTreeMap/data.go
+++ b/iSolarCloud/WebAppService/getCodeTreeMap/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getCodeTreeMap/struct.go b/iSolarCloud/WebAppService/getCodeTreeMap/struct.go
index b292e9e1a..cc8f637f3 100644
--- a/iSolarCloud/WebAppService/getCodeTreeMap/struct.go
+++ b/iSolarCloud/WebAppService/getCodeTreeMap/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDST/data.go b/iSolarCloud/WebAppService/getDST/data.go
index 8c67efc3c..cb4673b69 100644
--- a/iSolarCloud/WebAppService/getDST/data.go
+++ b/iSolarCloud/WebAppService/getDST/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDST/struct.go b/iSolarCloud/WebAppService/getDST/struct.go
index cb6fab667..5520c7326 100644
--- a/iSolarCloud/WebAppService/getDST/struct.go
+++ b/iSolarCloud/WebAppService/getDST/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDataCounts/data.go b/iSolarCloud/WebAppService/getDataCounts/data.go
index ebf54551c..2468168f1 100644
--- a/iSolarCloud/WebAppService/getDataCounts/data.go
+++ b/iSolarCloud/WebAppService/getDataCounts/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDataCounts/struct.go b/iSolarCloud/WebAppService/getDataCounts/struct.go
index fd8f832f1..203bfb532 100644
--- a/iSolarCloud/WebAppService/getDataCounts/struct.go
+++ b/iSolarCloud/WebAppService/getDataCounts/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDataInfo/data.go b/iSolarCloud/WebAppService/getDataInfo/data.go
index 82cc7ef3b..3f92f87b1 100644
--- a/iSolarCloud/WebAppService/getDataInfo/data.go
+++ b/iSolarCloud/WebAppService/getDataInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDataInfo/struct.go b/iSolarCloud/WebAppService/getDataInfo/struct.go
index 584605d6a..1518a8a3b 100644
--- a/iSolarCloud/WebAppService/getDataInfo/struct.go
+++ b/iSolarCloud/WebAppService/getDataInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDevList/data.go b/iSolarCloud/WebAppService/getDevList/data.go
index 21d93d624..6abc90fd1 100644
--- a/iSolarCloud/WebAppService/getDevList/data.go
+++ b/iSolarCloud/WebAppService/getDevList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDevList/struct.go b/iSolarCloud/WebAppService/getDevList/struct.go
index e754ad119..9f166f79a 100644
--- a/iSolarCloud/WebAppService/getDevList/struct.go
+++ b/iSolarCloud/WebAppService/getDevList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDevName/data.go b/iSolarCloud/WebAppService/getDevName/data.go
index 012764403..680fa69da 100644
--- a/iSolarCloud/WebAppService/getDevName/data.go
+++ b/iSolarCloud/WebAppService/getDevName/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDevName/struct.go b/iSolarCloud/WebAppService/getDevName/struct.go
index beb25b71c..1aa9e5e23 100644
--- a/iSolarCloud/WebAppService/getDevName/struct.go
+++ b/iSolarCloud/WebAppService/getDevName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDevTypeList/data.go b/iSolarCloud/WebAppService/getDevTypeList/data.go
index 31cd8cf6b..43dfde053 100644
--- a/iSolarCloud/WebAppService/getDevTypeList/data.go
+++ b/iSolarCloud/WebAppService/getDevTypeList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDevTypeList/struct.go b/iSolarCloud/WebAppService/getDevTypeList/struct.go
index dc17b8fe3..e2b655c60 100644
--- a/iSolarCloud/WebAppService/getDevTypeList/struct.go
+++ b/iSolarCloud/WebAppService/getDevTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDeviceDataList/data.go b/iSolarCloud/WebAppService/getDeviceDataList/data.go
index e1c354e10..01ec20cc4 100644
--- a/iSolarCloud/WebAppService/getDeviceDataList/data.go
+++ b/iSolarCloud/WebAppService/getDeviceDataList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDeviceDataList/struct.go b/iSolarCloud/WebAppService/getDeviceDataList/struct.go
index 0726ead0f..3dee78e08 100644
--- a/iSolarCloud/WebAppService/getDeviceDataList/struct.go
+++ b/iSolarCloud/WebAppService/getDeviceDataList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDeviceFactory/data.go b/iSolarCloud/WebAppService/getDeviceFactory/data.go
index c364fa59e..cb8f8a270 100644
--- a/iSolarCloud/WebAppService/getDeviceFactory/data.go
+++ b/iSolarCloud/WebAppService/getDeviceFactory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDeviceFactory/struct.go b/iSolarCloud/WebAppService/getDeviceFactory/struct.go
index 8291a006b..d348a3929 100644
--- a/iSolarCloud/WebAppService/getDeviceFactory/struct.go
+++ b/iSolarCloud/WebAppService/getDeviceFactory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go b/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go
index 81459e28c..9cf62c797 100644
--- a/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go
+++ b/iSolarCloud/WebAppService/getDeviceInfoForCheck/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go b/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go
index 89448f9c8..c4470604c 100644
--- a/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go
+++ b/iSolarCloud/WebAppService/getDeviceInfoForCheck/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDevicePointAttrs/data.go b/iSolarCloud/WebAppService/getDevicePointAttrs/data.go
index f56f40eac..08f21aa75 100644
--- a/iSolarCloud/WebAppService/getDevicePointAttrs/data.go
+++ b/iSolarCloud/WebAppService/getDevicePointAttrs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go b/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go
index 121254c34..e24453542 100644
--- a/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go
+++ b/iSolarCloud/WebAppService/getDevicePointAttrs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDeviceTreeChild/data.go b/iSolarCloud/WebAppService/getDeviceTreeChild/data.go
index 3807c382e..70da026a8 100644
--- a/iSolarCloud/WebAppService/getDeviceTreeChild/data.go
+++ b/iSolarCloud/WebAppService/getDeviceTreeChild/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go b/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go
index 644baf131..5dcb82687 100644
--- a/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go
+++ b/iSolarCloud/WebAppService/getDeviceTreeChild/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDeviceUuid/data.go b/iSolarCloud/WebAppService/getDeviceUuid/data.go
index e3dfb6999..b65943f23 100644
--- a/iSolarCloud/WebAppService/getDeviceUuid/data.go
+++ b/iSolarCloud/WebAppService/getDeviceUuid/data.go
@@ -60,7 +60,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDeviceUuid/struct.go b/iSolarCloud/WebAppService/getDeviceUuid/struct.go
index e7fa7ca50..e3a9de216 100644
--- a/iSolarCloud/WebAppService/getDeviceUuid/struct.go
+++ b/iSolarCloud/WebAppService/getDeviceUuid/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDutyInfoById/data.go b/iSolarCloud/WebAppService/getDutyInfoById/data.go
index 2ecafb017..e7d20d005 100644
--- a/iSolarCloud/WebAppService/getDutyInfoById/data.go
+++ b/iSolarCloud/WebAppService/getDutyInfoById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDutyInfoById/struct.go b/iSolarCloud/WebAppService/getDutyInfoById/struct.go
index 52f3bcadb..24443efbb 100644
--- a/iSolarCloud/WebAppService/getDutyInfoById/struct.go
+++ b/iSolarCloud/WebAppService/getDutyInfoById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getDutyOrgZtree/data.go b/iSolarCloud/WebAppService/getDutyOrgZtree/data.go
index d0a96ccbb..eb4f0d448 100644
--- a/iSolarCloud/WebAppService/getDutyOrgZtree/data.go
+++ b/iSolarCloud/WebAppService/getDutyOrgZtree/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go b/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go
index a72979444..60e9036e9 100644
--- a/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go
+++ b/iSolarCloud/WebAppService/getDutyOrgZtree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getElecEffectList/data.go b/iSolarCloud/WebAppService/getElecEffectList/data.go
index fe604bf53..74627fbbe 100644
--- a/iSolarCloud/WebAppService/getElecEffectList/data.go
+++ b/iSolarCloud/WebAppService/getElecEffectList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getElecEffectList/struct.go b/iSolarCloud/WebAppService/getElecEffectList/struct.go
index 635c8270d..a775067f8 100644
--- a/iSolarCloud/WebAppService/getElecEffectList/struct.go
+++ b/iSolarCloud/WebAppService/getElecEffectList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getEnvironmentInfo/data.go b/iSolarCloud/WebAppService/getEnvironmentInfo/data.go
index 8a59540a7..11030431b 100644
--- a/iSolarCloud/WebAppService/getEnvironmentInfo/data.go
+++ b/iSolarCloud/WebAppService/getEnvironmentInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go b/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go
index c77e52396..3398c13ce 100644
--- a/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go
+++ b/iSolarCloud/WebAppService/getEnvironmentInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultList/data.go b/iSolarCloud/WebAppService/getFaultList/data.go
index e30a385d2..2d19a3610 100644
--- a/iSolarCloud/WebAppService/getFaultList/data.go
+++ b/iSolarCloud/WebAppService/getFaultList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultList/struct.go b/iSolarCloud/WebAppService/getFaultList/struct.go
index f61f74271..d5868c77c 100644
--- a/iSolarCloud/WebAppService/getFaultList/struct.go
+++ b/iSolarCloud/WebAppService/getFaultList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultName/data.go b/iSolarCloud/WebAppService/getFaultName/data.go
index 22b236730..82387fb02 100644
--- a/iSolarCloud/WebAppService/getFaultName/data.go
+++ b/iSolarCloud/WebAppService/getFaultName/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultName/struct.go b/iSolarCloud/WebAppService/getFaultName/struct.go
index 422029146..1b9b5a259 100644
--- a/iSolarCloud/WebAppService/getFaultName/struct.go
+++ b/iSolarCloud/WebAppService/getFaultName/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultOrder/data.go b/iSolarCloud/WebAppService/getFaultOrder/data.go
index 608f64efa..51faace6e 100644
--- a/iSolarCloud/WebAppService/getFaultOrder/data.go
+++ b/iSolarCloud/WebAppService/getFaultOrder/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultOrder/struct.go b/iSolarCloud/WebAppService/getFaultOrder/struct.go
index b00e0f754..5e718ae5d 100644
--- a/iSolarCloud/WebAppService/getFaultOrder/struct.go
+++ b/iSolarCloud/WebAppService/getFaultOrder/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go b/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go
index 79c770bac..b2a1b62c0 100644
--- a/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go
+++ b/iSolarCloud/WebAppService/getFaultOrderByOrderId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go b/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go
index 7c0a276da..937e3a199 100644
--- a/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go
+++ b/iSolarCloud/WebAppService/getFaultOrderByOrderId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultOrderList/data.go b/iSolarCloud/WebAppService/getFaultOrderList/data.go
index 6b63b1c28..52292a26e 100644
--- a/iSolarCloud/WebAppService/getFaultOrderList/data.go
+++ b/iSolarCloud/WebAppService/getFaultOrderList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultOrderList/struct.go b/iSolarCloud/WebAppService/getFaultOrderList/struct.go
index 90e1008cc..09895db5e 100644
--- a/iSolarCloud/WebAppService/getFaultOrderList/struct.go
+++ b/iSolarCloud/WebAppService/getFaultOrderList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getFaultOrderStepList/data.go b/iSolarCloud/WebAppService/getFaultOrderStepList/data.go
index 03bc89b57..f391d1c7c 100644
--- a/iSolarCloud/WebAppService/getFaultOrderStepList/data.go
+++ b/iSolarCloud/WebAppService/getFaultOrderStepList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go b/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go
index 73b6b4435..b547f1633 100644
--- a/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go
+++ b/iSolarCloud/WebAppService/getFaultOrderStepList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getHTRoleList/data.go b/iSolarCloud/WebAppService/getHTRoleList/data.go
index d0cc989b2..aab5d743e 100644
--- a/iSolarCloud/WebAppService/getHTRoleList/data.go
+++ b/iSolarCloud/WebAppService/getHTRoleList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getHTRoleList/struct.go b/iSolarCloud/WebAppService/getHTRoleList/struct.go
index 507f1838b..8a4a27f27 100644
--- a/iSolarCloud/WebAppService/getHTRoleList/struct.go
+++ b/iSolarCloud/WebAppService/getHTRoleList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getHistoryComments/data.go b/iSolarCloud/WebAppService/getHistoryComments/data.go
index 3ddcb2508..0a975e38b 100644
--- a/iSolarCloud/WebAppService/getHistoryComments/data.go
+++ b/iSolarCloud/WebAppService/getHistoryComments/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getHistoryComments/struct.go b/iSolarCloud/WebAppService/getHistoryComments/struct.go
index 6ff82828f..9a5c6fc68 100644
--- a/iSolarCloud/WebAppService/getHistoryComments/struct.go
+++ b/iSolarCloud/WebAppService/getHistoryComments/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInfo/data.go b/iSolarCloud/WebAppService/getInfo/data.go
index 934076d54..03611c617 100644
--- a/iSolarCloud/WebAppService/getInfo/data.go
+++ b/iSolarCloud/WebAppService/getInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInfo/struct.go b/iSolarCloud/WebAppService/getInfo/struct.go
index 54d4f27a3..09168ac3f 100644
--- a/iSolarCloud/WebAppService/getInfo/struct.go
+++ b/iSolarCloud/WebAppService/getInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInverteTableListCount/data.go b/iSolarCloud/WebAppService/getInverteTableListCount/data.go
index dd4de512b..35389dced 100644
--- a/iSolarCloud/WebAppService/getInverteTableListCount/data.go
+++ b/iSolarCloud/WebAppService/getInverteTableListCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInverteTableListCount/struct.go b/iSolarCloud/WebAppService/getInverteTableListCount/struct.go
index d37e8063b..2ccd3cff9 100644
--- a/iSolarCloud/WebAppService/getInverteTableListCount/struct.go
+++ b/iSolarCloud/WebAppService/getInverteTableListCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go
index 90ee8c388..260d4db86 100644
--- a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go
+++ b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go
index bd11b3b53..c5f6e3689 100644
--- a/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go
+++ b/iSolarCloud/WebAppService/getInverterDiscreteDistributioList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInverterDiscreteList/data.go b/iSolarCloud/WebAppService/getInverterDiscreteList/data.go
index baac50be3..c37c94660 100644
--- a/iSolarCloud/WebAppService/getInverterDiscreteList/data.go
+++ b/iSolarCloud/WebAppService/getInverterDiscreteList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go b/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go
index dd3e0999e..434a515ab 100644
--- a/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go
+++ b/iSolarCloud/WebAppService/getInverterDiscreteList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInverterFactoryList/data.go b/iSolarCloud/WebAppService/getInverterFactoryList/data.go
index 863b2c747..53040179b 100644
--- a/iSolarCloud/WebAppService/getInverterFactoryList/data.go
+++ b/iSolarCloud/WebAppService/getInverterFactoryList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInverterFactoryList/struct.go b/iSolarCloud/WebAppService/getInverterFactoryList/struct.go
index 8ff6b8141..f0f6517eb 100644
--- a/iSolarCloud/WebAppService/getInverterFactoryList/struct.go
+++ b/iSolarCloud/WebAppService/getInverterFactoryList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getInverterInfo/data.go b/iSolarCloud/WebAppService/getInverterInfo/data.go
index a541889cc..f7c8bb84f 100644
--- a/iSolarCloud/WebAppService/getInverterInfo/data.go
+++ b/iSolarCloud/WebAppService/getInverterInfo/data.go
@@ -39,7 +39,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getInverterInfo/struct.go b/iSolarCloud/WebAppService/getInverterInfo/struct.go
index f68f4550a..c1ca7da1c 100644
--- a/iSolarCloud/WebAppService/getInverterInfo/struct.go
+++ b/iSolarCloud/WebAppService/getInverterInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getLoadCurveList/data.go b/iSolarCloud/WebAppService/getLoadCurveList/data.go
index 99f43e54f..7968a940b 100644
--- a/iSolarCloud/WebAppService/getLoadCurveList/data.go
+++ b/iSolarCloud/WebAppService/getLoadCurveList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getLoadCurveList/struct.go b/iSolarCloud/WebAppService/getLoadCurveList/struct.go
index 59fe4e39c..f786da16e 100644
--- a/iSolarCloud/WebAppService/getLoadCurveList/struct.go
+++ b/iSolarCloud/WebAppService/getLoadCurveList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go
index eb34b270f..4d40d5c5e 100644
--- a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go
+++ b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/data.go
@@ -111,7 +111,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go
index 6b95257a8..ad5c5fd87 100644
--- a/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go
+++ b/iSolarCloud/WebAppService/getMqttConfigInfoByAppkey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getMultiPowers/data.go b/iSolarCloud/WebAppService/getMultiPowers/data.go
index 7386ce4f6..788ae4d79 100644
--- a/iSolarCloud/WebAppService/getMultiPowers/data.go
+++ b/iSolarCloud/WebAppService/getMultiPowers/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getMultiPowers/struct.go b/iSolarCloud/WebAppService/getMultiPowers/struct.go
index a9787904f..561949bf4 100644
--- a/iSolarCloud/WebAppService/getMultiPowers/struct.go
+++ b/iSolarCloud/WebAppService/getMultiPowers/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOndutyQuery/data.go b/iSolarCloud/WebAppService/getOndutyQuery/data.go
index f8f3137c3..3a755c6bc 100644
--- a/iSolarCloud/WebAppService/getOndutyQuery/data.go
+++ b/iSolarCloud/WebAppService/getOndutyQuery/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOndutyQuery/struct.go b/iSolarCloud/WebAppService/getOndutyQuery/struct.go
index 8e75e5a78..f32a92439 100644
--- a/iSolarCloud/WebAppService/getOndutyQuery/struct.go
+++ b/iSolarCloud/WebAppService/getOndutyQuery/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOperateTicketUserList/data.go b/iSolarCloud/WebAppService/getOperateTicketUserList/data.go
index 4626dec42..221f49f5e 100644
--- a/iSolarCloud/WebAppService/getOperateTicketUserList/data.go
+++ b/iSolarCloud/WebAppService/getOperateTicketUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go b/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go
index 647bb7b21..be9edeaf2 100644
--- a/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go
+++ b/iSolarCloud/WebAppService/getOperateTicketUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go b/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go
index 088f45772..199e79841 100644
--- a/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go
+++ b/iSolarCloud/WebAppService/getOptTicketsAttachments/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go b/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go
index 768ad8b5e..c5f51a85d 100644
--- a/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go
+++ b/iSolarCloud/WebAppService/getOptTicketsAttachments/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOrderCount/data.go b/iSolarCloud/WebAppService/getOrderCount/data.go
index 06dd1eddc..ef185e794 100644
--- a/iSolarCloud/WebAppService/getOrderCount/data.go
+++ b/iSolarCloud/WebAppService/getOrderCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOrderCount/struct.go b/iSolarCloud/WebAppService/getOrderCount/struct.go
index 116ed5ea9..e3f0845ce 100644
--- a/iSolarCloud/WebAppService/getOrderCount/struct.go
+++ b/iSolarCloud/WebAppService/getOrderCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOrderData/data.go b/iSolarCloud/WebAppService/getOrderData/data.go
index 5a146b5d8..d5c649881 100644
--- a/iSolarCloud/WebAppService/getOrderData/data.go
+++ b/iSolarCloud/WebAppService/getOrderData/data.go
@@ -39,7 +39,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOrderData/struct.go b/iSolarCloud/WebAppService/getOrderData/struct.go
index dc7a8ecdf..e46e6a058 100644
--- a/iSolarCloud/WebAppService/getOrderData/struct.go
+++ b/iSolarCloud/WebAppService/getOrderData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOrderDataSize/data.go b/iSolarCloud/WebAppService/getOrderDataSize/data.go
index 1239a882d..4b7a0f19a 100644
--- a/iSolarCloud/WebAppService/getOrderDataSize/data.go
+++ b/iSolarCloud/WebAppService/getOrderDataSize/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOrderDataSize/struct.go b/iSolarCloud/WebAppService/getOrderDataSize/struct.go
index 260f5e2b9..bdf1e0466 100644
--- a/iSolarCloud/WebAppService/getOrderDataSize/struct.go
+++ b/iSolarCloud/WebAppService/getOrderDataSize/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go b/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go
index 508eaf9d9..3f9aeb6c2 100644
--- a/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go
+++ b/iSolarCloud/WebAppService/getOrgPsEquipmentList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go b/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go
index a04f2bc22..848511f93 100644
--- a/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go
+++ b/iSolarCloud/WebAppService/getOrgPsEquipmentList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go
index 6945cccf3..9f0cdbaf5 100644
--- a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go
+++ b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go
index 599bff9f0..642142b74 100644
--- a/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go
+++ b/iSolarCloud/WebAppService/getOrgPsPowerGenerationSummaryReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getParentUidChain/data.go b/iSolarCloud/WebAppService/getParentUidChain/data.go
index 680ed4e52..f50421ac6 100644
--- a/iSolarCloud/WebAppService/getParentUidChain/data.go
+++ b/iSolarCloud/WebAppService/getParentUidChain/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getParentUidChain/struct.go b/iSolarCloud/WebAppService/getParentUidChain/struct.go
index 4350c8dbb..c25af6487 100644
--- a/iSolarCloud/WebAppService/getParentUidChain/struct.go
+++ b/iSolarCloud/WebAppService/getParentUidChain/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go b/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go
index 190e75d4a..e4759a8e9 100644
--- a/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go
+++ b/iSolarCloud/WebAppService/getPowerKwhkwpList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go b/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go
index 07597c62a..cba42aad6 100644
--- a/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go
+++ b/iSolarCloud/WebAppService/getPowerKwhkwpList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerPrList/data.go b/iSolarCloud/WebAppService/getPowerPrList/data.go
index 0e046322c..b4e775d58 100644
--- a/iSolarCloud/WebAppService/getPowerPrList/data.go
+++ b/iSolarCloud/WebAppService/getPowerPrList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerPrList/struct.go b/iSolarCloud/WebAppService/getPowerPrList/struct.go
index e354b5ab6..04b01855f 100644
--- a/iSolarCloud/WebAppService/getPowerPrList/struct.go
+++ b/iSolarCloud/WebAppService/getPowerPrList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go b/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go
index 277bc943b..90f74124a 100644
--- a/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go
+++ b/iSolarCloud/WebAppService/getPowerPredictionInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go b/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go
index 2448a8873..89a745904 100644
--- a/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go
+++ b/iSolarCloud/WebAppService/getPowerPredictionInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerTrendDayData/data.go b/iSolarCloud/WebAppService/getPowerTrendDayData/data.go
index 886d7a6a0..e8200a2b9 100644
--- a/iSolarCloud/WebAppService/getPowerTrendDayData/data.go
+++ b/iSolarCloud/WebAppService/getPowerTrendDayData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go b/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go
index 59d499ae7..bd6f32cc2 100644
--- a/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go
+++ b/iSolarCloud/WebAppService/getPowerTrendDayData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go b/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go
index 2b9c206bc..acf66f0ed 100644
--- a/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go
+++ b/iSolarCloud/WebAppService/getPowerTrendMonthData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go b/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go
index 1c5b40fbc..a72f1465f 100644
--- a/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go
+++ b/iSolarCloud/WebAppService/getPowerTrendMonthData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerTrendYearData/data.go b/iSolarCloud/WebAppService/getPowerTrendYearData/data.go
index 6df5979b0..9c9c45d1c 100644
--- a/iSolarCloud/WebAppService/getPowerTrendYearData/data.go
+++ b/iSolarCloud/WebAppService/getPowerTrendYearData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go b/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go
index 5a5f82a63..60a03f5e4 100644
--- a/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go
+++ b/iSolarCloud/WebAppService/getPowerTrendYearData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPowerValue/data.go b/iSolarCloud/WebAppService/getPowerValue/data.go
index 87bd57d50..636564764 100644
--- a/iSolarCloud/WebAppService/getPowerValue/data.go
+++ b/iSolarCloud/WebAppService/getPowerValue/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPowerValue/struct.go b/iSolarCloud/WebAppService/getPowerValue/struct.go
index ee56363b1..95772b5b4 100644
--- a/iSolarCloud/WebAppService/getPowerValue/struct.go
+++ b/iSolarCloud/WebAppService/getPowerValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsBlock/data.go b/iSolarCloud/WebAppService/getPsBlock/data.go
index d6f568f6e..8b50dc548 100644
--- a/iSolarCloud/WebAppService/getPsBlock/data.go
+++ b/iSolarCloud/WebAppService/getPsBlock/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsBlock/struct.go b/iSolarCloud/WebAppService/getPsBlock/struct.go
index 7285af08f..518963e85 100644
--- a/iSolarCloud/WebAppService/getPsBlock/struct.go
+++ b/iSolarCloud/WebAppService/getPsBlock/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsBlockData/data.go b/iSolarCloud/WebAppService/getPsBlockData/data.go
index 94604a7df..ff0ccf2c3 100644
--- a/iSolarCloud/WebAppService/getPsBlockData/data.go
+++ b/iSolarCloud/WebAppService/getPsBlockData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsBlockData/struct.go b/iSolarCloud/WebAppService/getPsBlockData/struct.go
index a5a556561..089e9d92e 100644
--- a/iSolarCloud/WebAppService/getPsBlockData/struct.go
+++ b/iSolarCloud/WebAppService/getPsBlockData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsBlockTree/data.go b/iSolarCloud/WebAppService/getPsBlockTree/data.go
index 3bcd6dda1..73a92c9b7 100644
--- a/iSolarCloud/WebAppService/getPsBlockTree/data.go
+++ b/iSolarCloud/WebAppService/getPsBlockTree/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsBlockTree/struct.go b/iSolarCloud/WebAppService/getPsBlockTree/struct.go
index 008c07e05..b7bcb1a35 100644
--- a/iSolarCloud/WebAppService/getPsBlockTree/struct.go
+++ b/iSolarCloud/WebAppService/getPsBlockTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsBoxListCount/data.go b/iSolarCloud/WebAppService/getPsBoxListCount/data.go
index 6fb68567e..07f76fce5 100644
--- a/iSolarCloud/WebAppService/getPsBoxListCount/data.go
+++ b/iSolarCloud/WebAppService/getPsBoxListCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsBoxListCount/struct.go b/iSolarCloud/WebAppService/getPsBoxListCount/struct.go
index c93fd4866..e309474c8 100644
--- a/iSolarCloud/WebAppService/getPsBoxListCount/struct.go
+++ b/iSolarCloud/WebAppService/getPsBoxListCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsCBoxDetail/data.go b/iSolarCloud/WebAppService/getPsCBoxDetail/data.go
index b1503a380..0b0edb925 100644
--- a/iSolarCloud/WebAppService/getPsCBoxDetail/data.go
+++ b/iSolarCloud/WebAppService/getPsCBoxDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go b/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go
index 735bec0e1..a85418732 100644
--- a/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go
+++ b/iSolarCloud/WebAppService/getPsCBoxDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsContact/data.go b/iSolarCloud/WebAppService/getPsContact/data.go
index 110a2c459..d0686740b 100644
--- a/iSolarCloud/WebAppService/getPsContact/data.go
+++ b/iSolarCloud/WebAppService/getPsContact/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsContact/struct.go b/iSolarCloud/WebAppService/getPsContact/struct.go
index 5bd6d60e3..bb175dd07 100644
--- a/iSolarCloud/WebAppService/getPsContact/struct.go
+++ b/iSolarCloud/WebAppService/getPsContact/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsDataVal/data.go b/iSolarCloud/WebAppService/getPsDataVal/data.go
index 26cb880d8..b7db796ff 100644
--- a/iSolarCloud/WebAppService/getPsDataVal/data.go
+++ b/iSolarCloud/WebAppService/getPsDataVal/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsDataVal/struct.go b/iSolarCloud/WebAppService/getPsDataVal/struct.go
index 8a15020d3..423801282 100644
--- a/iSolarCloud/WebAppService/getPsDataVal/struct.go
+++ b/iSolarCloud/WebAppService/getPsDataVal/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go b/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go
index e8204f6ce..d7661e0dd 100644
--- a/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go
+++ b/iSolarCloud/WebAppService/getPsDeviceCheckList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go b/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go
index a20e95d30..23c1cc96f 100644
--- a/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go
+++ b/iSolarCloud/WebAppService/getPsDeviceCheckList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go b/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go
index fb1d4699e..8521b1b15 100644
--- a/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go
+++ b/iSolarCloud/WebAppService/getPsDeviceFaultList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go b/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go
index f74f10162..847fd71cf 100644
--- a/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go
+++ b/iSolarCloud/WebAppService/getPsDeviceFaultList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsFaultList/data.go b/iSolarCloud/WebAppService/getPsFaultList/data.go
index bb4bf1f0e..d5fa64e2a 100644
--- a/iSolarCloud/WebAppService/getPsFaultList/data.go
+++ b/iSolarCloud/WebAppService/getPsFaultList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsFaultList/struct.go b/iSolarCloud/WebAppService/getPsFaultList/struct.go
index 2c673d94f..4f0418c90 100644
--- a/iSolarCloud/WebAppService/getPsFaultList/struct.go
+++ b/iSolarCloud/WebAppService/getPsFaultList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsIdByUserId/data.go b/iSolarCloud/WebAppService/getPsIdByUserId/data.go
index 4fedad6f6..5bfbc4106 100644
--- a/iSolarCloud/WebAppService/getPsIdByUserId/data.go
+++ b/iSolarCloud/WebAppService/getPsIdByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsIdByUserId/struct.go b/iSolarCloud/WebAppService/getPsIdByUserId/struct.go
index 5de1c38a3..75169de5f 100644
--- a/iSolarCloud/WebAppService/getPsIdByUserId/struct.go
+++ b/iSolarCloud/WebAppService/getPsIdByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsIdState/struct.go b/iSolarCloud/WebAppService/getPsIdState/struct.go
index 9ba7399b5..267ce8305 100644
--- a/iSolarCloud/WebAppService/getPsIdState/struct.go
+++ b/iSolarCloud/WebAppService/getPsIdState/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsList/data.go b/iSolarCloud/WebAppService/getPsList/data.go
index 54a59aef4..3f6fde81e 100644
--- a/iSolarCloud/WebAppService/getPsList/data.go
+++ b/iSolarCloud/WebAppService/getPsList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsList/struct.go b/iSolarCloud/WebAppService/getPsList/struct.go
index c900b0ce0..dca873441 100644
--- a/iSolarCloud/WebAppService/getPsList/struct.go
+++ b/iSolarCloud/WebAppService/getPsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go b/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go
index 4713b3328..daedc2687 100644
--- a/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go
+++ b/iSolarCloud/WebAppService/getPsListForWorkTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go b/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go
index 203a8484f..74f03769d 100644
--- a/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go
+++ b/iSolarCloud/WebAppService/getPsListForWorkTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsPictureMessage/data.go b/iSolarCloud/WebAppService/getPsPictureMessage/data.go
index 593697657..bff2fe295 100644
--- a/iSolarCloud/WebAppService/getPsPictureMessage/data.go
+++ b/iSolarCloud/WebAppService/getPsPictureMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsPictureMessage/struct.go b/iSolarCloud/WebAppService/getPsPictureMessage/struct.go
index 4076caa2c..b5420d7fd 100644
--- a/iSolarCloud/WebAppService/getPsPictureMessage/struct.go
+++ b/iSolarCloud/WebAppService/getPsPictureMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go
index 595d6aa7e..80be5d393 100644
--- a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go
+++ b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go
index a06833fcb..b6bbb597a 100644
--- a/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go
+++ b/iSolarCloud/WebAppService/getPsTicketSizeAndClockNum/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsTree/data.go b/iSolarCloud/WebAppService/getPsTree/data.go
index 8ac03f93a..7f910a63c 100644
--- a/iSolarCloud/WebAppService/getPsTree/data.go
+++ b/iSolarCloud/WebAppService/getPsTree/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsTree/struct.go b/iSolarCloud/WebAppService/getPsTree/struct.go
index f639ff408..24dba8aa1 100644
--- a/iSolarCloud/WebAppService/getPsTree/struct.go
+++ b/iSolarCloud/WebAppService/getPsTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsTreeChild/data.go b/iSolarCloud/WebAppService/getPsTreeChild/data.go
index be960841a..69862b4fc 100644
--- a/iSolarCloud/WebAppService/getPsTreeChild/data.go
+++ b/iSolarCloud/WebAppService/getPsTreeChild/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsTreeChild/struct.go b/iSolarCloud/WebAppService/getPsTreeChild/struct.go
index eccae0262..1a6f6911a 100644
--- a/iSolarCloud/WebAppService/getPsTreeChild/struct.go
+++ b/iSolarCloud/WebAppService/getPsTreeChild/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsUserList/data.go b/iSolarCloud/WebAppService/getPsUserList/data.go
index 7cc95cce2..8ff7e115a 100644
--- a/iSolarCloud/WebAppService/getPsUserList/data.go
+++ b/iSolarCloud/WebAppService/getPsUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsUserList/struct.go b/iSolarCloud/WebAppService/getPsUserList/struct.go
index 42bff6d4a..68737a233 100644
--- a/iSolarCloud/WebAppService/getPsUserList/struct.go
+++ b/iSolarCloud/WebAppService/getPsUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPsValue/data.go b/iSolarCloud/WebAppService/getPsValue/data.go
index e733559dc..32273318b 100644
--- a/iSolarCloud/WebAppService/getPsValue/data.go
+++ b/iSolarCloud/WebAppService/getPsValue/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPsValue/struct.go b/iSolarCloud/WebAppService/getPsValue/struct.go
index 1d1caaf77..417be7288 100644
--- a/iSolarCloud/WebAppService/getPsValue/struct.go
+++ b/iSolarCloud/WebAppService/getPsValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getPscSeriseData/data.go b/iSolarCloud/WebAppService/getPscSeriseData/data.go
index eb47d227a..a4394b2b6 100644
--- a/iSolarCloud/WebAppService/getPscSeriseData/data.go
+++ b/iSolarCloud/WebAppService/getPscSeriseData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getPscSeriseData/struct.go b/iSolarCloud/WebAppService/getPscSeriseData/struct.go
index f538fe546..35c683f39 100644
--- a/iSolarCloud/WebAppService/getPscSeriseData/struct.go
+++ b/iSolarCloud/WebAppService/getPscSeriseData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go b/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go
index fa5908404..23920ad4e 100644
--- a/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go
+++ b/iSolarCloud/WebAppService/getReportInfoByReportId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getReportListByType/data.go b/iSolarCloud/WebAppService/getReportListByType/data.go
index d825bb379..8057ca09c 100644
--- a/iSolarCloud/WebAppService/getReportListByType/data.go
+++ b/iSolarCloud/WebAppService/getReportListByType/data.go
@@ -26,6 +26,8 @@ func (rd RequestData) Help() string {
type ResultData []struct {
+ GoStructParent GoStruct.GoStructParent `json:"GoStruct" DataTable:"true" DataTableSortOn:"CreateTime"`
+
CreateTime valueTypes.DateTime `json:"create_time"`
Cycle valueTypes.Integer `json:"cycle"`
ID valueTypes.Integer `json:"id"`
@@ -55,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.DateId.Format(valueTypes.DateTimeLayoutDay)
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getReportListByType/struct.go b/iSolarCloud/WebAppService/getReportListByType/struct.go
index 5447feef9..a850bc34d 100644
--- a/iSolarCloud/WebAppService/getReportListByType/struct.go
+++ b/iSolarCloud/WebAppService/getReportListByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getReportPsTree/data.go b/iSolarCloud/WebAppService/getReportPsTree/data.go
index 25b347541..25b729c8c 100644
--- a/iSolarCloud/WebAppService/getReportPsTree/data.go
+++ b/iSolarCloud/WebAppService/getReportPsTree/data.go
@@ -42,7 +42,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.DateId.Format(valueTypes.DateTimeLayoutDay)
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getReportPsTree/struct.go b/iSolarCloud/WebAppService/getReportPsTree/struct.go
index d4ee50ee6..5ec8827f5 100644
--- a/iSolarCloud/WebAppService/getReportPsTree/struct.go
+++ b/iSolarCloud/WebAppService/getReportPsTree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getRoleList/data.go b/iSolarCloud/WebAppService/getRoleList/data.go
index be01f5b36..04207ebf0 100644
--- a/iSolarCloud/WebAppService/getRoleList/data.go
+++ b/iSolarCloud/WebAppService/getRoleList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getRoleList/struct.go b/iSolarCloud/WebAppService/getRoleList/struct.go
index 718080da1..c6557c255 100644
--- a/iSolarCloud/WebAppService/getRoleList/struct.go
+++ b/iSolarCloud/WebAppService/getRoleList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSafeEffectList/data.go b/iSolarCloud/WebAppService/getSafeEffectList/data.go
index 6079a128a..6f3f7609c 100644
--- a/iSolarCloud/WebAppService/getSafeEffectList/data.go
+++ b/iSolarCloud/WebAppService/getSafeEffectList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSafeEffectList/struct.go b/iSolarCloud/WebAppService/getSafeEffectList/struct.go
index c1f371584..b55f1b945 100644
--- a/iSolarCloud/WebAppService/getSafeEffectList/struct.go
+++ b/iSolarCloud/WebAppService/getSafeEffectList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go b/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go
index 54b0f7bef..c84ada28b 100644
--- a/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go
+++ b/iSolarCloud/WebAppService/getSecondTypeTicketList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go b/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go
index e4f65d153..65873cdbd 100644
--- a/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go
+++ b/iSolarCloud/WebAppService/getSecondTypeTicketList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go
index e61e34d53..73f4becd2 100644
--- a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go
+++ b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go
index 5d074dac4..eedafcb59 100644
--- a/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go
+++ b/iSolarCloud/WebAppService/getSecondTypeTicketListForTicketDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSelfReportPoint/data.go b/iSolarCloud/WebAppService/getSelfReportPoint/data.go
index f9f2f1a7b..e6d3eb54a 100644
--- a/iSolarCloud/WebAppService/getSelfReportPoint/data.go
+++ b/iSolarCloud/WebAppService/getSelfReportPoint/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSelfReportPoint/struct.go b/iSolarCloud/WebAppService/getSelfReportPoint/struct.go
index b1d282a77..0db3593b4 100644
--- a/iSolarCloud/WebAppService/getSelfReportPoint/struct.go
+++ b/iSolarCloud/WebAppService/getSelfReportPoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSparePartsDetail/data.go b/iSolarCloud/WebAppService/getSparePartsDetail/data.go
index 1a3985196..7d2c71fa9 100644
--- a/iSolarCloud/WebAppService/getSparePartsDetail/data.go
+++ b/iSolarCloud/WebAppService/getSparePartsDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSparePartsDetail/struct.go b/iSolarCloud/WebAppService/getSparePartsDetail/struct.go
index c3afb4cfe..72aa54f1f 100644
--- a/iSolarCloud/WebAppService/getSparePartsDetail/struct.go
+++ b/iSolarCloud/WebAppService/getSparePartsDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getStatementList/data.go b/iSolarCloud/WebAppService/getStatementList/data.go
index 7f18b6e6d..e28d79696 100644
--- a/iSolarCloud/WebAppService/getStatementList/data.go
+++ b/iSolarCloud/WebAppService/getStatementList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getStatementList/struct.go b/iSolarCloud/WebAppService/getStatementList/struct.go
index 7abc33231..7a7703ef3 100644
--- a/iSolarCloud/WebAppService/getStatementList/struct.go
+++ b/iSolarCloud/WebAppService/getStatementList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getStoreByStationId/data.go b/iSolarCloud/WebAppService/getStoreByStationId/data.go
index 8130d78c3..f6deab618 100644
--- a/iSolarCloud/WebAppService/getStoreByStationId/data.go
+++ b/iSolarCloud/WebAppService/getStoreByStationId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getStoreByStationId/struct.go b/iSolarCloud/WebAppService/getStoreByStationId/struct.go
index 4912a6150..b762a28d0 100644
--- a/iSolarCloud/WebAppService/getStoreByStationId/struct.go
+++ b/iSolarCloud/WebAppService/getStoreByStationId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getSysUserList/data.go b/iSolarCloud/WebAppService/getSysUserList/data.go
index 865e679ab..28a009a1a 100644
--- a/iSolarCloud/WebAppService/getSysUserList/data.go
+++ b/iSolarCloud/WebAppService/getSysUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getSysUserList/struct.go b/iSolarCloud/WebAppService/getSysUserList/struct.go
index 1f3e658dd..f56e32871 100644
--- a/iSolarCloud/WebAppService/getSysUserList/struct.go
+++ b/iSolarCloud/WebAppService/getSysUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getTableList/data.go b/iSolarCloud/WebAppService/getTableList/data.go
index fd91c8723..d10183294 100644
--- a/iSolarCloud/WebAppService/getTableList/data.go
+++ b/iSolarCloud/WebAppService/getTableList/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getTableList/struct.go b/iSolarCloud/WebAppService/getTableList/struct.go
index c0832da39..b3fee0ff3 100644
--- a/iSolarCloud/WebAppService/getTableList/struct.go
+++ b/iSolarCloud/WebAppService/getTableList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getUserList/data.go b/iSolarCloud/WebAppService/getUserList/data.go
index 63a27209e..2b1f5bde9 100644
--- a/iSolarCloud/WebAppService/getUserList/data.go
+++ b/iSolarCloud/WebAppService/getUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getUserList/struct.go b/iSolarCloud/WebAppService/getUserList/struct.go
index 32ce66a28..38b1fb67b 100644
--- a/iSolarCloud/WebAppService/getUserList/struct.go
+++ b/iSolarCloud/WebAppService/getUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getWeather/data.go b/iSolarCloud/WebAppService/getWeather/data.go
index 0cfdca78e..2dfce3cc9 100644
--- a/iSolarCloud/WebAppService/getWeather/data.go
+++ b/iSolarCloud/WebAppService/getWeather/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getWeather/struct.go b/iSolarCloud/WebAppService/getWeather/struct.go
index 5466a92f4..ae2dc081a 100644
--- a/iSolarCloud/WebAppService/getWeather/struct.go
+++ b/iSolarCloud/WebAppService/getWeather/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getWorkTicketList/data.go b/iSolarCloud/WebAppService/getWorkTicketList/data.go
index df38556e2..997f9c3e0 100644
--- a/iSolarCloud/WebAppService/getWorkTicketList/data.go
+++ b/iSolarCloud/WebAppService/getWorkTicketList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getWorkTicketList/struct.go b/iSolarCloud/WebAppService/getWorkTicketList/struct.go
index c732e5e69..171dd7467 100644
--- a/iSolarCloud/WebAppService/getWorkTicketList/struct.go
+++ b/iSolarCloud/WebAppService/getWorkTicketList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go
index 00d74d040..6caeabcaa 100644
--- a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go
+++ b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go
index b44a8416e..0587be42d 100644
--- a/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go
+++ b/iSolarCloud/WebAppService/getWorkTicketListForTicketDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go b/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go
index 7f3f0e32f..bf96136ef 100644
--- a/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go
+++ b/iSolarCloud/WebAppService/getWorkTicketRunningCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go b/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go
index be433f943..07e13cb38 100644
--- a/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go
+++ b/iSolarCloud/WebAppService/getWorkTicketRunningCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getWorkTicketUserList/data.go b/iSolarCloud/WebAppService/getWorkTicketUserList/data.go
index 275953188..f964ff910 100644
--- a/iSolarCloud/WebAppService/getWorkTicketUserList/data.go
+++ b/iSolarCloud/WebAppService/getWorkTicketUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go b/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go
index 71607baf9..cde594b20 100644
--- a/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go
+++ b/iSolarCloud/WebAppService/getWorkTicketUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getinverterType/data.go b/iSolarCloud/WebAppService/getinverterType/data.go
index 20a43db65..c3d28a6eb 100644
--- a/iSolarCloud/WebAppService/getinverterType/data.go
+++ b/iSolarCloud/WebAppService/getinverterType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getinverterType/struct.go b/iSolarCloud/WebAppService/getinverterType/struct.go
index 237097bda..5b8827dae 100644
--- a/iSolarCloud/WebAppService/getinverterType/struct.go
+++ b/iSolarCloud/WebAppService/getinverterType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/getreportPermissionByUser/data.go b/iSolarCloud/WebAppService/getreportPermissionByUser/data.go
index 46a675109..b0c0977d6 100644
--- a/iSolarCloud/WebAppService/getreportPermissionByUser/data.go
+++ b/iSolarCloud/WebAppService/getreportPermissionByUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go b/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go
index eb471b4ac..5c5fb7530 100644
--- a/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go
+++ b/iSolarCloud/WebAppService/getreportPermissionByUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/handleValue/data.go b/iSolarCloud/WebAppService/handleValue/data.go
index b4a05845f..70d29febd 100644
--- a/iSolarCloud/WebAppService/handleValue/data.go
+++ b/iSolarCloud/WebAppService/handleValue/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/handleValue/struct.go b/iSolarCloud/WebAppService/handleValue/struct.go
index da9dc6e07..ab6bbf857 100644
--- a/iSolarCloud/WebAppService/handleValue/struct.go
+++ b/iSolarCloud/WebAppService/handleValue/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/modifyDeviceInfo/data.go b/iSolarCloud/WebAppService/modifyDeviceInfo/data.go
index 86fae9e29..4efa8c4ba 100644
--- a/iSolarCloud/WebAppService/modifyDeviceInfo/data.go
+++ b/iSolarCloud/WebAppService/modifyDeviceInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go b/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go
index af2902b2f..264760cba 100644
--- a/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go
+++ b/iSolarCloud/WebAppService/modifyDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/operaStoreSpareParts/data.go b/iSolarCloud/WebAppService/operaStoreSpareParts/data.go
index 37f52282a..18d34a01d 100644
--- a/iSolarCloud/WebAppService/operaStoreSpareParts/data.go
+++ b/iSolarCloud/WebAppService/operaStoreSpareParts/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go b/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go
index 263542cb9..9bf31fb28 100644
--- a/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go
+++ b/iSolarCloud/WebAppService/operaStoreSpareParts/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/operateBillTransferToUser/data.go b/iSolarCloud/WebAppService/operateBillTransferToUser/data.go
index ed64e8ec2..1d3a61a1d 100644
--- a/iSolarCloud/WebAppService/operateBillTransferToUser/data.go
+++ b/iSolarCloud/WebAppService/operateBillTransferToUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go b/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go
index 84f673c36..6eb869787 100644
--- a/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go
+++ b/iSolarCloud/WebAppService/operateBillTransferToUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryAllStockInventory/data.go b/iSolarCloud/WebAppService/queryAllStockInventory/data.go
index 2d160b5fa..37d6c5c2b 100644
--- a/iSolarCloud/WebAppService/queryAllStockInventory/data.go
+++ b/iSolarCloud/WebAppService/queryAllStockInventory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryAllStockInventory/struct.go b/iSolarCloud/WebAppService/queryAllStockInventory/struct.go
index 317d247fc..5e643cd7b 100644
--- a/iSolarCloud/WebAppService/queryAllStockInventory/struct.go
+++ b/iSolarCloud/WebAppService/queryAllStockInventory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go b/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go
index e73e11e53..58c452bb7 100644
--- a/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go
+++ b/iSolarCloud/WebAppService/queryBatteryBoardsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go
index 8252cae2e..42ce3e3f4 100644
--- a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go
+++ b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go
index b8f414fc6..c1824c15a 100644
--- a/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go
+++ b/iSolarCloud/WebAppService/queryBatteryBoardsPointsData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryCodeByType/data.go b/iSolarCloud/WebAppService/queryCodeByType/data.go
index 7c53308c8..a5f189daa 100644
--- a/iSolarCloud/WebAppService/queryCodeByType/data.go
+++ b/iSolarCloud/WebAppService/queryCodeByType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryCodeByType/struct.go b/iSolarCloud/WebAppService/queryCodeByType/struct.go
index ec0cce98f..1da41aa0c 100644
--- a/iSolarCloud/WebAppService/queryCodeByType/struct.go
+++ b/iSolarCloud/WebAppService/queryCodeByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryDeviceInfoList/data.go b/iSolarCloud/WebAppService/queryDeviceInfoList/data.go
index a7b1c8513..510517e30 100644
--- a/iSolarCloud/WebAppService/queryDeviceInfoList/data.go
+++ b/iSolarCloud/WebAppService/queryDeviceInfoList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go b/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go
index ebaec9805..e53f52932 100644
--- a/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go
+++ b/iSolarCloud/WebAppService/queryDeviceInfoList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go b/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go
index dfcacbdd3..307991e60 100644
--- a/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go
+++ b/iSolarCloud/WebAppService/queryElectricityCalendarData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go b/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go
index 5b140f57b..ff8b91d92 100644
--- a/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go
+++ b/iSolarCloud/WebAppService/queryElectricityCalendarData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryFaultCodes/data.go b/iSolarCloud/WebAppService/queryFaultCodes/data.go
index 35b5c7e67..689e46ae4 100644
--- a/iSolarCloud/WebAppService/queryFaultCodes/data.go
+++ b/iSolarCloud/WebAppService/queryFaultCodes/data.go
@@ -41,7 +41,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryFaultCodes/struct.go b/iSolarCloud/WebAppService/queryFaultCodes/struct.go
index 93fae6cc2..2eb8a933d 100644
--- a/iSolarCloud/WebAppService/queryFaultCodes/struct.go
+++ b/iSolarCloud/WebAppService/queryFaultCodes/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go b/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go
index 71eca4d85..051cb1b8a 100644
--- a/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go
+++ b/iSolarCloud/WebAppService/queryFaultLevelAndType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go b/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go
index 0fd1b8e80..dd26b191b 100644
--- a/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go
+++ b/iSolarCloud/WebAppService/queryFaultLevelAndType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryFaultNames/data.go b/iSolarCloud/WebAppService/queryFaultNames/data.go
index 592c66ad5..4556a3b93 100644
--- a/iSolarCloud/WebAppService/queryFaultNames/data.go
+++ b/iSolarCloud/WebAppService/queryFaultNames/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryFaultNames/struct.go b/iSolarCloud/WebAppService/queryFaultNames/struct.go
index fa3bbba3f..8b0c6d896 100644
--- a/iSolarCloud/WebAppService/queryFaultNames/struct.go
+++ b/iSolarCloud/WebAppService/queryFaultNames/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryMaterialType/data.go b/iSolarCloud/WebAppService/queryMaterialType/data.go
index 7139311a4..3262a6e06 100644
--- a/iSolarCloud/WebAppService/queryMaterialType/data.go
+++ b/iSolarCloud/WebAppService/queryMaterialType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryMaterialType/struct.go b/iSolarCloud/WebAppService/queryMaterialType/struct.go
index dd3167d63..1ef34fd6e 100644
--- a/iSolarCloud/WebAppService/queryMaterialType/struct.go
+++ b/iSolarCloud/WebAppService/queryMaterialType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryNounAndKlgList/data.go b/iSolarCloud/WebAppService/queryNounAndKlgList/data.go
index 7f90a4e12..b8c4d4a9a 100644
--- a/iSolarCloud/WebAppService/queryNounAndKlgList/data.go
+++ b/iSolarCloud/WebAppService/queryNounAndKlgList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go b/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go
index b80d4062c..5c7a28951 100644
--- a/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go
+++ b/iSolarCloud/WebAppService/queryNounAndKlgList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryNounList/data.go b/iSolarCloud/WebAppService/queryNounList/data.go
index 9ad565417..389798fa9 100644
--- a/iSolarCloud/WebAppService/queryNounList/data.go
+++ b/iSolarCloud/WebAppService/queryNounList/data.go
@@ -12,7 +12,7 @@ const Url = "/v1/faultService/queryNounList"
const Disabled = false
type RequestData struct {
- FaultTypeCode valueTypes.String `json:"fault_type_code" required:"true"`
+ FaultTypeCode valueTypes.Integer `json:"fault_type_code" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -38,10 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- // pkg := reflection.GetName("", *e)
- // dt := valueTypes.NewDateTime(valueTypes.Now)
- // name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryNounList/struct.go b/iSolarCloud/WebAppService/queryNounList/struct.go
index b5da95c7d..4605857ce 100644
--- a/iSolarCloud/WebAppService/queryNounList/struct.go
+++ b/iSolarCloud/WebAppService/queryNounList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryOptTickctInfo/data.go b/iSolarCloud/WebAppService/queryOptTickctInfo/data.go
index 020d60a07..bfdf6506b 100644
--- a/iSolarCloud/WebAppService/queryOptTickctInfo/data.go
+++ b/iSolarCloud/WebAppService/queryOptTickctInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go b/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go
index 357d22848..fd7699dff 100644
--- a/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go
+++ b/iSolarCloud/WebAppService/queryOptTickctInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryOrgIdByUser/data.go b/iSolarCloud/WebAppService/queryOrgIdByUser/data.go
index a4a4d7903..2650ebe14 100644
--- a/iSolarCloud/WebAppService/queryOrgIdByUser/data.go
+++ b/iSolarCloud/WebAppService/queryOrgIdByUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go b/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go
index 23cafd4de..33d37ffdf 100644
--- a/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go
+++ b/iSolarCloud/WebAppService/queryOrgIdByUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryPsCountryList/data.go b/iSolarCloud/WebAppService/queryPsCountryList/data.go
index ecfeb53df..9a7262819 100644
--- a/iSolarCloud/WebAppService/queryPsCountryList/data.go
+++ b/iSolarCloud/WebAppService/queryPsCountryList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryPsCountryList/struct.go b/iSolarCloud/WebAppService/queryPsCountryList/struct.go
index d640120ff..aefe762b8 100644
--- a/iSolarCloud/WebAppService/queryPsCountryList/struct.go
+++ b/iSolarCloud/WebAppService/queryPsCountryList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryPsProvcnList/data.go b/iSolarCloud/WebAppService/queryPsProvcnList/data.go
index dd4d5c0b1..94148ea8a 100644
--- a/iSolarCloud/WebAppService/queryPsProvcnList/data.go
+++ b/iSolarCloud/WebAppService/queryPsProvcnList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryPsProvcnList/struct.go b/iSolarCloud/WebAppService/queryPsProvcnList/struct.go
index 8a53e3e82..9eec887c3 100644
--- a/iSolarCloud/WebAppService/queryPsProvcnList/struct.go
+++ b/iSolarCloud/WebAppService/queryPsProvcnList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go b/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go
index 6d8aa7a41..a11e9f89a 100644
--- a/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go
+++ b/iSolarCloud/WebAppService/queryPsTypeByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go b/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go
index f8e314819..37d8965ed 100644
--- a/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go
+++ b/iSolarCloud/WebAppService/queryPsTypeByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/querySparePartsList/data.go b/iSolarCloud/WebAppService/querySparePartsList/data.go
index 7fa4dcacf..ee59e1438 100644
--- a/iSolarCloud/WebAppService/querySparePartsList/data.go
+++ b/iSolarCloud/WebAppService/querySparePartsList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/querySparePartsList/struct.go b/iSolarCloud/WebAppService/querySparePartsList/struct.go
index d748c29a2..110d9947a 100644
--- a/iSolarCloud/WebAppService/querySparePartsList/struct.go
+++ b/iSolarCloud/WebAppService/querySparePartsList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryStoreList/data.go b/iSolarCloud/WebAppService/queryStoreList/data.go
index ed7ec8f37..ab3060d89 100644
--- a/iSolarCloud/WebAppService/queryStoreList/data.go
+++ b/iSolarCloud/WebAppService/queryStoreList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryStoreList/struct.go b/iSolarCloud/WebAppService/queryStoreList/struct.go
index 4b8dd9c14..1b7e39bea 100644
--- a/iSolarCloud/WebAppService/queryStoreList/struct.go
+++ b/iSolarCloud/WebAppService/queryStoreList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/querySysTimezone/data.go b/iSolarCloud/WebAppService/querySysTimezone/data.go
index f272cd1be..87b9051fb 100644
--- a/iSolarCloud/WebAppService/querySysTimezone/data.go
+++ b/iSolarCloud/WebAppService/querySysTimezone/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/querySysTimezone/struct.go b/iSolarCloud/WebAppService/querySysTimezone/struct.go
index 8fa6cbc60..b0ec602be 100644
--- a/iSolarCloud/WebAppService/querySysTimezone/struct.go
+++ b/iSolarCloud/WebAppService/querySysTimezone/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go b/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go
index a04c17a48..2d8a988e6 100644
--- a/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go
+++ b/iSolarCloud/WebAppService/queryUnInventorySpareList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go b/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go
index 110fd45eb..08a53dd02 100644
--- a/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go
+++ b/iSolarCloud/WebAppService/queryUnInventorySpareList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
index a09272548..7371d1588 100644
--- a/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
+++ b/iSolarCloud/WebAppService/queryUserCurveTemplateData/data.go
@@ -53,13 +53,13 @@ type ResultData struct {
Cycle valueTypes.Integer `json:"cycle"`
TemplateId valueTypes.Integer `json:"template_id"`
TemplateName valueTypes.String `json:"template_name"`
- PointsData PointsData `json:"points_data" PointNameAppend:"false"` // PointNameFromChild:"Order"`
+ PointsData PointsData `json:"points_data" PointIdReplace:"true"`
}
type PointsData struct {
- Devices map[string]DeviceData `json:"devices" PointNameAppend:"false"` // PointNameFromChild:"DateId" PointNameAppend:"false"`
- Order valueTypes.String `json:"order" PointSplitOn:","`
+ Devices map[string]DeviceData `json:"devices" PointIdReplace:"true"` // PointIdFromChild:"DateId" PointIdReplace:"true"`
+ Order valueTypes.String `json:"order" PointSplitOn:"," PointValueReplace:"&" PointValueReplaceWith:".p"`
}
func (p *PointsData) UnmarshalJSON(data []byte) error {
@@ -106,7 +106,7 @@ type DeviceData struct {
DeviceName valueTypes.String `json:"device_name"`
DeviceType valueTypes.Integer `json:"device_type"`
DeviceUUID valueTypes.Integer `json:"device_uuid"`
- Points Points `json:"points" PointNameAppend:"false" DataTable:"true" DataTableSortOn:"PointId"`
+ Points Points `json:"points" DataTable:"true" DataTableMerge:"true" DataTableSortOn:"PointId"` // PointIdReplace:"false" PointIdFromChild:"PsId.PsKey"
}
func (p *DeviceData) UnmarshalJSON(data []byte) error {
diff --git a/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go b/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go
index 2f3d3c475..1e17e5f8b 100644
--- a/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go
+++ b/iSolarCloud/WebAppService/queryUserCurveTemplateData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/renewOperation/data.go b/iSolarCloud/WebAppService/renewOperation/data.go
index 2f3d4d103..bef7dc573 100644
--- a/iSolarCloud/WebAppService/renewOperation/data.go
+++ b/iSolarCloud/WebAppService/renewOperation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/renewOperation/struct.go b/iSolarCloud/WebAppService/renewOperation/struct.go
index e49bc43d9..1d527201c 100644
--- a/iSolarCloud/WebAppService/renewOperation/struct.go
+++ b/iSolarCloud/WebAppService/renewOperation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveCustomReport/data.go b/iSolarCloud/WebAppService/saveCustomReport/data.go
index 06e5182dd..d4d23ee92 100644
--- a/iSolarCloud/WebAppService/saveCustomReport/data.go
+++ b/iSolarCloud/WebAppService/saveCustomReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveCustomReport/struct.go b/iSolarCloud/WebAppService/saveCustomReport/struct.go
index 5741c451c..352184bcd 100644
--- a/iSolarCloud/WebAppService/saveCustomReport/struct.go
+++ b/iSolarCloud/WebAppService/saveCustomReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveDutyInfo/data.go b/iSolarCloud/WebAppService/saveDutyInfo/data.go
index 784683f11..64fc21f02 100644
--- a/iSolarCloud/WebAppService/saveDutyInfo/data.go
+++ b/iSolarCloud/WebAppService/saveDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveDutyInfo/struct.go b/iSolarCloud/WebAppService/saveDutyInfo/struct.go
index 31ac605d2..dd918293f 100644
--- a/iSolarCloud/WebAppService/saveDutyInfo/struct.go
+++ b/iSolarCloud/WebAppService/saveDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveInventory/data.go b/iSolarCloud/WebAppService/saveInventory/data.go
index 572e32934..1dee4bbb3 100644
--- a/iSolarCloud/WebAppService/saveInventory/data.go
+++ b/iSolarCloud/WebAppService/saveInventory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveInventory/struct.go b/iSolarCloud/WebAppService/saveInventory/struct.go
index b9429b5b6..5084968c5 100644
--- a/iSolarCloud/WebAppService/saveInventory/struct.go
+++ b/iSolarCloud/WebAppService/saveInventory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveMaterial/data.go b/iSolarCloud/WebAppService/saveMaterial/data.go
index da481f8e5..08bf15447 100644
--- a/iSolarCloud/WebAppService/saveMaterial/data.go
+++ b/iSolarCloud/WebAppService/saveMaterial/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveMaterial/struct.go b/iSolarCloud/WebAppService/saveMaterial/struct.go
index 26e5e5621..c487e5708 100644
--- a/iSolarCloud/WebAppService/saveMaterial/struct.go
+++ b/iSolarCloud/WebAppService/saveMaterial/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go b/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go
index dee66ff65..9cd43db76 100644
--- a/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go
+++ b/iSolarCloud/WebAppService/saveSecondTypeTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go b/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go
index eb5e40d23..f53ec0532 100644
--- a/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go
+++ b/iSolarCloud/WebAppService/saveSecondTypeTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveSelfReportPoint/data.go b/iSolarCloud/WebAppService/saveSelfReportPoint/data.go
index 16a748578..579a21be5 100644
--- a/iSolarCloud/WebAppService/saveSelfReportPoint/data.go
+++ b/iSolarCloud/WebAppService/saveSelfReportPoint/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go b/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go
index 92ea74de8..712f8883f 100644
--- a/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go
+++ b/iSolarCloud/WebAppService/saveSelfReportPoint/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/saveWorkTicket/data.go b/iSolarCloud/WebAppService/saveWorkTicket/data.go
index b8a71bb59..0b7396a20 100644
--- a/iSolarCloud/WebAppService/saveWorkTicket/data.go
+++ b/iSolarCloud/WebAppService/saveWorkTicket/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/saveWorkTicket/struct.go b/iSolarCloud/WebAppService/saveWorkTicket/struct.go
index 43a23b6d8..7da243b94 100644
--- a/iSolarCloud/WebAppService/saveWorkTicket/struct.go
+++ b/iSolarCloud/WebAppService/saveWorkTicket/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go
index fefacb9e6..2729e435e 100644
--- a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go
+++ b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go
index 86ae653d5..cc17c85a4 100644
--- a/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go
+++ b/iSolarCloud/WebAppService/secondTypeTicketFlowImplementStep/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go
index b9b53efe4..38341363d 100644
--- a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go
+++ b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go
index a5ebda057..751cb2aa8 100644
--- a/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go
+++ b/iSolarCloud/WebAppService/secondTypeTicketFlowTransferStep/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go b/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go
index 05e073781..960e678d8 100644
--- a/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go
+++ b/iSolarCloud/WebAppService/secondTypeUpdateSign/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go b/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go
index d54b3e497..afcdc3f9a 100644
--- a/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go
+++ b/iSolarCloud/WebAppService/secondTypeUpdateSign/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/selectPowerPageList/data.go b/iSolarCloud/WebAppService/selectPowerPageList/data.go
index 69e60b304..710808a37 100644
--- a/iSolarCloud/WebAppService/selectPowerPageList/data.go
+++ b/iSolarCloud/WebAppService/selectPowerPageList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/selectPowerPageList/struct.go b/iSolarCloud/WebAppService/selectPowerPageList/struct.go
index 437651f21..5602b571c 100644
--- a/iSolarCloud/WebAppService/selectPowerPageList/struct.go
+++ b/iSolarCloud/WebAppService/selectPowerPageList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go b/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go
index 0d170bb5d..e39bc6935 100644
--- a/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go
+++ b/iSolarCloud/WebAppService/showAnalyzefxDetail/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go b/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go
index 46d89a996..06213aee8 100644
--- a/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go
+++ b/iSolarCloud/WebAppService/showAnalyzefxDetail/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showFxReport/data.go b/iSolarCloud/WebAppService/showFxReport/data.go
index 76179a269..0949a3cba 100644
--- a/iSolarCloud/WebAppService/showFxReport/data.go
+++ b/iSolarCloud/WebAppService/showFxReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/showFxReport/struct.go b/iSolarCloud/WebAppService/showFxReport/struct.go
index ee2274c89..40b07cd20 100644
--- a/iSolarCloud/WebAppService/showFxReport/struct.go
+++ b/iSolarCloud/WebAppService/showFxReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showMaterNameList/data.go b/iSolarCloud/WebAppService/showMaterNameList/data.go
index e6c0a8f67..d931ecbb6 100644
--- a/iSolarCloud/WebAppService/showMaterNameList/data.go
+++ b/iSolarCloud/WebAppService/showMaterNameList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/showMaterNameList/struct.go b/iSolarCloud/WebAppService/showMaterNameList/struct.go
index 981500d72..27b87da75 100644
--- a/iSolarCloud/WebAppService/showMaterNameList/struct.go
+++ b/iSolarCloud/WebAppService/showMaterNameList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showMaterSubTypeList/data.go b/iSolarCloud/WebAppService/showMaterSubTypeList/data.go
index 9373d7f93..8e0fcb429 100644
--- a/iSolarCloud/WebAppService/showMaterSubTypeList/data.go
+++ b/iSolarCloud/WebAppService/showMaterSubTypeList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go b/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go
index 76ce748ef..672826c90 100644
--- a/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go
+++ b/iSolarCloud/WebAppService/showMaterSubTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showPSView/struct.go b/iSolarCloud/WebAppService/showPSView/struct.go
index 10a10b846..5960a434a 100644
--- a/iSolarCloud/WebAppService/showPSView/struct.go
+++ b/iSolarCloud/WebAppService/showPSView/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/showTjReport/data.go b/iSolarCloud/WebAppService/showTjReport/data.go
index 993728e6d..41946c782 100644
--- a/iSolarCloud/WebAppService/showTjReport/data.go
+++ b/iSolarCloud/WebAppService/showTjReport/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/showTjReport/struct.go b/iSolarCloud/WebAppService/showTjReport/struct.go
index ac04b1813..b831c85ea 100644
--- a/iSolarCloud/WebAppService/showTjReport/struct.go
+++ b/iSolarCloud/WebAppService/showTjReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/templateLikesInfo/data.go b/iSolarCloud/WebAppService/templateLikesInfo/data.go
index 3223001e2..8df2a6f30 100644
--- a/iSolarCloud/WebAppService/templateLikesInfo/data.go
+++ b/iSolarCloud/WebAppService/templateLikesInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/templateLikesInfo/struct.go b/iSolarCloud/WebAppService/templateLikesInfo/struct.go
index 5d89f086e..33489f993 100644
--- a/iSolarCloud/WebAppService/templateLikesInfo/struct.go
+++ b/iSolarCloud/WebAppService/templateLikesInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updOptTicketInfo/data.go b/iSolarCloud/WebAppService/updOptTicketInfo/data.go
index 2573a1ab5..7ed7541fc 100644
--- a/iSolarCloud/WebAppService/updOptTicketInfo/data.go
+++ b/iSolarCloud/WebAppService/updOptTicketInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updOptTicketInfo/struct.go b/iSolarCloud/WebAppService/updOptTicketInfo/struct.go
index 9b87a1ec8..85961a3e0 100644
--- a/iSolarCloud/WebAppService/updOptTicketInfo/struct.go
+++ b/iSolarCloud/WebAppService/updOptTicketInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go
index 9182ca32d..d588b55d9 100644
--- a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go
+++ b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go
index eae1482e8..d43523ffc 100644
--- a/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go
+++ b/iSolarCloud/WebAppService/updataWorkTicketAfterStartProcess/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateBillTicketForTask/data.go b/iSolarCloud/WebAppService/updateBillTicketForTask/data.go
index de14d1c5f..965d37896 100644
--- a/iSolarCloud/WebAppService/updateBillTicketForTask/data.go
+++ b/iSolarCloud/WebAppService/updateBillTicketForTask/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go b/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go
index 4ae01500a..7ceae4857 100644
--- a/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go
+++ b/iSolarCloud/WebAppService/updateBillTicketForTask/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateDutyInfo/data.go b/iSolarCloud/WebAppService/updateDutyInfo/data.go
index 403faa5b8..e9a62d9c9 100644
--- a/iSolarCloud/WebAppService/updateDutyInfo/data.go
+++ b/iSolarCloud/WebAppService/updateDutyInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateDutyInfo/struct.go b/iSolarCloud/WebAppService/updateDutyInfo/struct.go
index 3e6344bb9..9ad04800a 100644
--- a/iSolarCloud/WebAppService/updateDutyInfo/struct.go
+++ b/iSolarCloud/WebAppService/updateDutyInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go
index f5c17f14d..03576ad34 100644
--- a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go
+++ b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go
index 6d42be996..3c00add3c 100644
--- a/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go
+++ b/iSolarCloud/WebAppService/updateKnowledgeBaseUseNumber/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateMaterial/data.go b/iSolarCloud/WebAppService/updateMaterial/data.go
index 8c48c4fd4..f33fb5f66 100644
--- a/iSolarCloud/WebAppService/updateMaterial/data.go
+++ b/iSolarCloud/WebAppService/updateMaterial/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateMaterial/struct.go b/iSolarCloud/WebAppService/updateMaterial/struct.go
index a39cb9597..f0f2b3987 100644
--- a/iSolarCloud/WebAppService/updateMaterial/struct.go
+++ b/iSolarCloud/WebAppService/updateMaterial/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateSpareParts/data.go b/iSolarCloud/WebAppService/updateSpareParts/data.go
index 7df7a2a0f..35f954bd4 100644
--- a/iSolarCloud/WebAppService/updateSpareParts/data.go
+++ b/iSolarCloud/WebAppService/updateSpareParts/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateSpareParts/struct.go b/iSolarCloud/WebAppService/updateSpareParts/struct.go
index 0d5130925..ee357ba36 100644
--- a/iSolarCloud/WebAppService/updateSpareParts/struct.go
+++ b/iSolarCloud/WebAppService/updateSpareParts/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateStopReason/data.go b/iSolarCloud/WebAppService/updateStopReason/data.go
index 4ab8e6773..cc7476e97 100644
--- a/iSolarCloud/WebAppService/updateStopReason/data.go
+++ b/iSolarCloud/WebAppService/updateStopReason/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateStopReason/struct.go b/iSolarCloud/WebAppService/updateStopReason/struct.go
index 6f2d2d406..4bd647a71 100644
--- a/iSolarCloud/WebAppService/updateStopReason/struct.go
+++ b/iSolarCloud/WebAppService/updateStopReason/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebAppService/updateTemplate/data.go b/iSolarCloud/WebAppService/updateTemplate/data.go
index 4d89756e6..a99b9c51e 100644
--- a/iSolarCloud/WebAppService/updateTemplate/data.go
+++ b/iSolarCloud/WebAppService/updateTemplate/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebAppService/updateTemplate/struct.go b/iSolarCloud/WebAppService/updateTemplate/struct.go
index c970cb5b2..391c7faae 100644
--- a/iSolarCloud/WebAppService/updateTemplate/struct.go
+++ b/iSolarCloud/WebAppService/updateTemplate/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go
index 668ea0b41..97411308a 100644
--- a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go
index 0c074e34b..98f84c652 100644
--- a/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/addPowerDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go b/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go
index 1adbbf575..ef827e341 100644
--- a/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go
+++ b/iSolarCloud/WebIscmAppService/addPowerPointManage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go b/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go
index ce740a69e..301bdfa24 100644
--- a/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go
+++ b/iSolarCloud/WebIscmAppService/addPowerPointManage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go b/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go
index 6e14ab01e..975885866 100644
--- a/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/addSubTypeDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go b/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go
index e1f38d86e..19bfd4d9d 100644
--- a/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/addSubTypeDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go
index 880d97e4f..87b770149 100644
--- a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go
+++ b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go
index 51ff1c0f2..171579136 100644
--- a/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go
+++ b/iSolarCloud/WebIscmAppService/batchAddDevicesPropertis/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/batchDelDevice/data.go b/iSolarCloud/WebIscmAppService/batchDelDevice/data.go
index 47a4c4e0e..0667a0666 100644
--- a/iSolarCloud/WebIscmAppService/batchDelDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/batchDelDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go b/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go
index 4e3d68452..5be3b6553 100644
--- a/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/batchDelDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go
index b3df45d63..aa41501b2 100644
--- a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go
index 8369a5a1e..30c133e12 100644
--- a/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go
+++ b/iSolarCloud/WebIscmAppService/batchSavePowerDeviceTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
index d12116ada..dbf1de841 100644
--- a/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/checkDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go
index 8fa523d00..4865ea307 100644
--- a/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/checkDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go b/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go
index 07e9fb234..fadedcd5d 100644
--- a/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go
+++ b/iSolarCloud/WebIscmAppService/contactMessageOpera/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go b/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go
index 1efe80849..76b010e5c 100644
--- a/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go
+++ b/iSolarCloud/WebIscmAppService/contactMessageOpera/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/delDevice/data.go b/iSolarCloud/WebIscmAppService/delDevice/data.go
index edcb57870..b6691bea8 100644
--- a/iSolarCloud/WebIscmAppService/delDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/delDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/delDevice/struct.go b/iSolarCloud/WebIscmAppService/delDevice/struct.go
index 52e23d53a..dd0d5f430 100644
--- a/iSolarCloud/WebIscmAppService/delDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/delDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go
index a9d9c5ac6..4d904ec19 100644
--- a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go
index 93122f574..89e43d6a0 100644
--- a/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteDeviceFactory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go b/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go
index 512c23283..d47f4f1d0 100644
--- a/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteDeviceType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go b/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go
index fffa14c60..6b49d198d 100644
--- a/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteDeviceType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteMenu/data.go b/iSolarCloud/WebIscmAppService/deleteMenu/data.go
index b1144e089..225da69cd 100644
--- a/iSolarCloud/WebIscmAppService/deleteMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteMenu/struct.go b/iSolarCloud/WebIscmAppService/deleteMenu/struct.go
index 84ec13df9..86e5d4a9e 100644
--- a/iSolarCloud/WebIscmAppService/deleteMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go b/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go
index 6ab90254c..18baea6b9 100644
--- a/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteOneNotice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go b/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go
index f9e20f435..08565b990 100644
--- a/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteOneNotice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go
index 346319ac0..761bc5e6d 100644
--- a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go
index 868e3f89c..5d576c31c 100644
--- a/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteOrgNodeInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePicture/data.go b/iSolarCloud/WebIscmAppService/deletePicture/data.go
index e3778faec..7dd52f6e0 100644
--- a/iSolarCloud/WebIscmAppService/deletePicture/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePicture/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePicture/struct.go b/iSolarCloud/WebIscmAppService/deletePicture/struct.go
index 860aa9c60..0863fc253 100644
--- a/iSolarCloud/WebIscmAppService/deletePicture/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePicture/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePointInfo/data.go b/iSolarCloud/WebIscmAppService/deletePointInfo/data.go
index 4edc96c7c..71771324c 100644
--- a/iSolarCloud/WebIscmAppService/deletePointInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePointInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go b/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go
index b3310e813..7d39be10f 100644
--- a/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePointInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go
index 1599084d2..bb6488d7d 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go
index 36abeaf73..a23c0b5f1 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceChannl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go
index 7ffb545ff..bbe0a8ffc 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go
index 8eaa2327a..a65f700df 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go
index aae52fe17..759654c38 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go
index db5c45e9f..08d1738aa 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceParameterPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go
index 8640e5b3f..630e49a48 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go
index 4d08cf27f..288e679dc 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceSubType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go
index 85ff4e546..f15a7d870 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go
index f318d1352..9686816cc 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerDeviceTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deletePowerStore/data.go b/iSolarCloud/WebIscmAppService/deletePowerStore/data.go
index a5d64c819..0831b9696 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerStore/data.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerStore/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go b/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go
index 3357e08cf..8ab4496b1 100644
--- a/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go
+++ b/iSolarCloud/WebIscmAppService/deletePowerStore/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go
index f2eb02207..ac94797ba 100644
--- a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go
index e0d2e62be..e495a2211 100644
--- a/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteProcessDefinition/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteReport/data.go b/iSolarCloud/WebIscmAppService/deleteReport/data.go
index 804c0d6f7..2e74942ab 100644
--- a/iSolarCloud/WebIscmAppService/deleteReport/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteReport/struct.go b/iSolarCloud/WebIscmAppService/deleteReport/struct.go
index abd894b82..2165044cc 100644
--- a/iSolarCloud/WebIscmAppService/deleteReport/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deleteUserNode/data.go b/iSolarCloud/WebIscmAppService/deleteUserNode/data.go
index 4af34017c..edde3c25b 100644
--- a/iSolarCloud/WebIscmAppService/deleteUserNode/data.go
+++ b/iSolarCloud/WebIscmAppService/deleteUserNode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go b/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go
index 52944bd44..55bc79bbf 100644
--- a/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go
+++ b/iSolarCloud/WebIscmAppService/deleteUserNode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/deployProcess/data.go b/iSolarCloud/WebIscmAppService/deployProcess/data.go
index 8884ee472..f14c5ea20 100644
--- a/iSolarCloud/WebIscmAppService/deployProcess/data.go
+++ b/iSolarCloud/WebIscmAppService/deployProcess/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/deployProcess/struct.go b/iSolarCloud/WebIscmAppService/deployProcess/struct.go
index 75837eaa4..1749fe0ec 100644
--- a/iSolarCloud/WebIscmAppService/deployProcess/struct.go
+++ b/iSolarCloud/WebIscmAppService/deployProcess/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go b/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go
index c314fd041..3054511c0 100644
--- a/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go
+++ b/iSolarCloud/WebIscmAppService/editProcessManageAction/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go b/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go
index 3389e95a6..9776dcfd8 100644
--- a/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go
+++ b/iSolarCloud/WebIscmAppService/editProcessManageAction/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go b/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go
index b7630bc19..b420a7044 100644
--- a/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go
+++ b/iSolarCloud/WebIscmAppService/findImageInputStreamString/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go b/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go
index 0330e6123..48e255b0b 100644
--- a/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go
+++ b/iSolarCloud/WebIscmAppService/findImageInputStreamString/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go b/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go
index d923218a8..5b02fe0d5 100644
--- a/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go
+++ b/iSolarCloud/WebIscmAppService/getAllDevTypeList/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go b/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go
index 88ecd0326..e7d4a0bce 100644
--- a/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getAllDevTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go b/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go
index 6d7eb3bde..d1ae320dd 100644
--- a/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go
+++ b/iSolarCloud/WebIscmAppService/getAllNodeByType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go b/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go
index b2c0a3c05..d58be4869 100644
--- a/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go
+++ b/iSolarCloud/WebIscmAppService/getAllNodeByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getAuthKey/data.go b/iSolarCloud/WebIscmAppService/getAuthKey/data.go
index 47fcd6aee..a1b3fc968 100644
--- a/iSolarCloud/WebIscmAppService/getAuthKey/data.go
+++ b/iSolarCloud/WebIscmAppService/getAuthKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getAuthKey/struct.go b/iSolarCloud/WebIscmAppService/getAuthKey/struct.go
index 98ac4d7b7..4ea94bb0e 100644
--- a/iSolarCloud/WebIscmAppService/getAuthKey/struct.go
+++ b/iSolarCloud/WebIscmAppService/getAuthKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go b/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go
index 23078ee3d..62c6d8e83 100644
--- a/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go
+++ b/iSolarCloud/WebIscmAppService/getAuthKeyList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go b/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go
index aaded4223..e8988ce51 100644
--- a/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getAuthKeyList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getCodeByType/data.go b/iSolarCloud/WebIscmAppService/getCodeByType/data.go
index e8f8f3222..19bfcd660 100644
--- a/iSolarCloud/WebIscmAppService/getCodeByType/data.go
+++ b/iSolarCloud/WebIscmAppService/getCodeByType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getCodeByType/struct.go b/iSolarCloud/WebIscmAppService/getCodeByType/struct.go
index 2a5f18ca4..80ec94e66 100644
--- a/iSolarCloud/WebIscmAppService/getCodeByType/struct.go
+++ b/iSolarCloud/WebIscmAppService/getCodeByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getContactMessage/data.go b/iSolarCloud/WebIscmAppService/getContactMessage/data.go
index 55ffd0b32..5d29cfeb3 100644
--- a/iSolarCloud/WebIscmAppService/getContactMessage/data.go
+++ b/iSolarCloud/WebIscmAppService/getContactMessage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getContactMessage/struct.go b/iSolarCloud/WebIscmAppService/getContactMessage/struct.go
index 7178c01fe..8b84efdfc 100644
--- a/iSolarCloud/WebIscmAppService/getContactMessage/struct.go
+++ b/iSolarCloud/WebIscmAppService/getContactMessage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getCountryNew/data.go b/iSolarCloud/WebIscmAppService/getCountryNew/data.go
index 67aa57e1c..a1dafd907 100644
--- a/iSolarCloud/WebIscmAppService/getCountryNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getCountryNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getCountryNew/struct.go b/iSolarCloud/WebIscmAppService/getCountryNew/struct.go
index a220ae7e3..e34132c27 100644
--- a/iSolarCloud/WebIscmAppService/getCountryNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getCountryNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go
index 96540d03f..d850ae89e 100644
--- a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go
+++ b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go
index 680f874e9..c30130192 100644
--- a/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDefinitionIdByKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
index 3071b2fd1..e8d32ec62 100644
--- a/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeploymentList/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go b/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go
index e51cca4a9..47185f69a 100644
--- a/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeploymentList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go
index 69bca5696..ea5825cb6 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go
index c4892fb02..6ab860078 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceFactoryListByIds/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
index f0e311664..c16ce9e0f 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go
index f7463eb48..432097cc3 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDevicePro/data.go b/iSolarCloud/WebIscmAppService/getDevicePro/data.go
index dcedb88ff..c8ba41fb9 100644
--- a/iSolarCloud/WebIscmAppService/getDevicePro/data.go
+++ b/iSolarCloud/WebIscmAppService/getDevicePro/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDevicePro/struct.go b/iSolarCloud/WebIscmAppService/getDevicePro/struct.go
index b0530122a..a80803ec0 100644
--- a/iSolarCloud/WebIscmAppService/getDevicePro/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDevicePro/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go
index 532e0da5b..45b6d4453 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceSubType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go
index 499d5588e..24ab26358 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceSubType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
index 4aa53aa4b..3b2a74c41 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go
index 6ae98ac15..7a0daa630 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceType/data.go b/iSolarCloud/WebIscmAppService/getDeviceType/data.go
index 4aedd64ac..408d3153a 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceType/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceType/struct.go b/iSolarCloud/WebIscmAppService/getDeviceType/struct.go
index b79e8fceb..0e00f3f59 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceType/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
index 3dcf15006..ff2027c16 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go
index fe9e4d9e8..81f9407ce 100644
--- a/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDeviceTypeInfoById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getDutyUserList/data.go b/iSolarCloud/WebIscmAppService/getDutyUserList/data.go
index e52b94325..a69bacd65 100644
--- a/iSolarCloud/WebIscmAppService/getDutyUserList/data.go
+++ b/iSolarCloud/WebIscmAppService/getDutyUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go b/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go
index 5e81ddc8c..1a85553a3 100644
--- a/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getDutyUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go b/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go
index 3c104145c..9712d62b2 100644
--- a/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go
+++ b/iSolarCloud/WebIscmAppService/getFatherPrivileges/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go b/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go
index 5eead2055..42bc3d640 100644
--- a/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go
+++ b/iSolarCloud/WebIscmAppService/getFatherPrivileges/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go b/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go
index 48b848c0c..322821612 100644
--- a/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go
+++ b/iSolarCloud/WebIscmAppService/getGroupManSettings/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go b/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go
index 754b4755f..e3d10a614 100644
--- a/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go
+++ b/iSolarCloud/WebIscmAppService/getGroupManSettings/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go
index 500794cbe..df21738de 100644
--- a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go
+++ b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go
index de6df224b..37797e78d 100644
--- a/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go
+++ b/iSolarCloud/WebIscmAppService/getGroupManSettingsMembers/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go b/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go
index 33647a616..93c9f6419 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialByListId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go b/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go
index 3ab5b91c7..cc1058522 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialByListId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getMaterialByType/data.go b/iSolarCloud/WebIscmAppService/getMaterialByType/data.go
index 696855854..6c2e29c45 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialByType/data.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialByType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go b/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go
index ba76d8e0c..f6f30c66a 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialByType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getMaterialList/data.go b/iSolarCloud/WebIscmAppService/getMaterialList/data.go
index b23a0fb84..d5b20f90e 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialList/data.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getMaterialList/struct.go b/iSolarCloud/WebIscmAppService/getMaterialList/struct.go
index 52cd0a11c..d602b24e6 100644
--- a/iSolarCloud/WebIscmAppService/getMaterialList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getMaterialList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go
index aaf52991b..8afd20f66 100644
--- a/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go
+++ b/iSolarCloud/WebIscmAppService/getMaxDeviceIdByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getModelPoints/data.go b/iSolarCloud/WebIscmAppService/getModelPoints/data.go
index 4329f6855..cf472ef18 100644
--- a/iSolarCloud/WebIscmAppService/getModelPoints/data.go
+++ b/iSolarCloud/WebIscmAppService/getModelPoints/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getModelPoints/struct.go b/iSolarCloud/WebIscmAppService/getModelPoints/struct.go
index f32a31696..e2502ebbd 100644
--- a/iSolarCloud/WebIscmAppService/getModelPoints/struct.go
+++ b/iSolarCloud/WebIscmAppService/getModelPoints/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go b/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go
index 7e3905359..43d9d4500 100644
--- a/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go
+++ b/iSolarCloud/WebIscmAppService/getMoneyUnitList/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go b/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go
index 57cc7ff69..bf9e7c818 100644
--- a/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getMoneyUnitList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getNamecnNew/data.go b/iSolarCloud/WebIscmAppService/getNamecnNew/data.go
index fd02d698f..726b503cf 100644
--- a/iSolarCloud/WebIscmAppService/getNamecnNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getNamecnNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go b/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go
index acf3c3c40..d7b3d5f4e 100644
--- a/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getNamecnNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getNationList/data.go b/iSolarCloud/WebIscmAppService/getNationList/data.go
index 81fb0b509..60e7ce75d 100644
--- a/iSolarCloud/WebIscmAppService/getNationList/data.go
+++ b/iSolarCloud/WebIscmAppService/getNationList/data.go
@@ -40,7 +40,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getNationList/struct.go b/iSolarCloud/WebIscmAppService/getNationList/struct.go
index 63e01f25e..c39cf84a9 100644
--- a/iSolarCloud/WebIscmAppService/getNationList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getNationList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOperationRecord/data.go b/iSolarCloud/WebIscmAppService/getOperationRecord/data.go
index e1dbe951a..80326c040 100644
--- a/iSolarCloud/WebIscmAppService/getOperationRecord/data.go
+++ b/iSolarCloud/WebIscmAppService/getOperationRecord/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go b/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go
index c37675027..6b4ff334d 100644
--- a/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOperationRecord/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go
index 52cd6b38b..395c1f359 100644
--- a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go
index b9382e491..27204e2a7 100644
--- a/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgAndChildBasicInfoOptions/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go
index b22c4df7f..ee88b1623 100644
--- a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go
index 9f2374d2c..9ab1bc832 100644
--- a/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgAndStateAndCode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgForPs/data.go b/iSolarCloud/WebIscmAppService/getOrgForPs/data.go
index f089c959a..d4f993734 100644
--- a/iSolarCloud/WebIscmAppService/getOrgForPs/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgForPs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go b/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go
index 0f2e5e190..4c9b5f216 100644
--- a/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgForPs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgList/data.go b/iSolarCloud/WebIscmAppService/getOrgList/data.go
index 290507ef7..4e0ca77b8 100644
--- a/iSolarCloud/WebIscmAppService/getOrgList/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgList/data.go
@@ -71,7 +71,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgList/struct.go b/iSolarCloud/WebIscmAppService/getOrgList/struct.go
index 3c2284ecd..e6c62518e 100644
--- a/iSolarCloud/WebIscmAppService/getOrgList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go b/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go
index 47485fe8a..b1ac98c84 100644
--- a/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgListForUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go b/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go
index 81da471db..98b813e9c 100644
--- a/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgListForUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go
index 2c43e9188..b67e5fa66 100644
--- a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go
index 3ea67de3e..367447a48 100644
--- a/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgNodeInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgStationList/data.go b/iSolarCloud/WebIscmAppService/getOrgStationList/data.go
index 7bb9be781..5f31c695b 100644
--- a/iSolarCloud/WebIscmAppService/getOrgStationList/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgStationList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go b/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go
index e7bdffe2b..41d22aa9c 100644
--- a/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgStationList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go
index 57836b48d..2e35766a8 100644
--- a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go
index 9dea8df1d..82b14cb81 100644
--- a/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgStationListByPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgUserList/data.go b/iSolarCloud/WebIscmAppService/getOrgUserList/data.go
index fb4dcdaed..9f93d4368 100644
--- a/iSolarCloud/WebIscmAppService/getOrgUserList/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgUserList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go b/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go
index 4105b82e0..8433d2915 100644
--- a/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgUserList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go b/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go
index 5483df2fa..dc51067c7 100644
--- a/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgUserMapData/data.go
@@ -62,7 +62,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go b/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go
index 646774c3f..a0fdd770f 100644
--- a/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgUserMapData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree/data.go b/iSolarCloud/WebIscmAppService/getOrgZtree/data.go
index b2bd5b2c2..8abd4daf2 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtree/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtree/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go
index 92e0e038f..ddaaa8000 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtree/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go b/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go
index 75ed9c031..47af9d89c 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtree4User/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go
index ae6ed2087..dc5976c6e 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtree4User/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go
index c05b829b9..e451c816a 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go
index e0b33df6c..496dcb0b9 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtreeAsync/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go
index 8212abc6c..a16857aa7 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go
index 00c2c644d..e8519a747 100644
--- a/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/getOrgZtreeForUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPictureList/data.go b/iSolarCloud/WebIscmAppService/getPictureList/data.go
index 44049a20c..a33eef276 100644
--- a/iSolarCloud/WebIscmAppService/getPictureList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPictureList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPictureList/struct.go b/iSolarCloud/WebIscmAppService/getPictureList/struct.go
index db8f2b866..71ab90002 100644
--- a/iSolarCloud/WebIscmAppService/getPictureList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPictureList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPointInfo/data.go b/iSolarCloud/WebIscmAppService/getPointInfo/data.go
index 62620672d..107435bd1 100644
--- a/iSolarCloud/WebIscmAppService/getPointInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getPointInfo/data.go
@@ -61,7 +61,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg // + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPointInfo/struct.go b/iSolarCloud/WebIscmAppService/getPointInfo/struct.go
index ba5975dfe..70857ccf9 100644
--- a/iSolarCloud/WebIscmAppService/getPointInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPointInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go b/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go
index 9445b484b..ce1ec5329 100644
--- a/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go
+++ b/iSolarCloud/WebIscmAppService/getPointInfoPage/data.go
@@ -44,7 +44,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go b/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go
index 2e4172444..6c7f35209 100644
--- a/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPointInfoPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
index dac8209e7..318a52ec6 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDevice/data.go
@@ -71,7 +71,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go b/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go
index 53cac5be1..5968a9953 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go
index d334971c9..33ceee73c 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go
index 29b16c650..255eba8ba 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceChannl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go
index e3e2a9ee6..e33e184e6 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go
index 6e1023e66..124c9c99f 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go
index bbcb9f054..2c75ca753 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go
index 2fb255159..82e6d4f64 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceFactoryListCount/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go
index a044d6718..b2e2aea1f 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go
index 15d3dafcc..747e5c685 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go
index cfe7d0395..6937f0b5d 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/data.go
@@ -46,7 +46,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go
index dfa9355f1..83adacc60 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go
index 16a6f4f40..8a481c4ec 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go
index 0bad1ed8d..c41cf82dc 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceModelTechList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
index 71354df11..c6a217e96 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/data.go
@@ -8,11 +8,11 @@ import (
"github.com/MickMake/GoUnify/Only"
)
+
const Url = "/v1/devService/getPowerDeviceTypeList"
const Disabled = false
type RequestData struct {
- // DeviceType valueTypes.String `json:"device_type" required:"true"`
}
func (rd RequestData) IsValid() error {
@@ -24,17 +24,18 @@ func (rd RequestData) Help() string {
return ret
}
-
type ResultData []struct {
- IsRemoteUpgrade valueTypes.Integer `json:"is_remote_upgrade"`
- SysID valueTypes.String `json:"sys_id"`
- SysName valueTypes.String `json:"sys_name"`
- TypeCode valueTypes.Integer `json:"type_code"`
- TypeID valueTypes.Integer `json:"type_id"`
- TypeName valueTypes.String `json:"type_name"`
- TypeNameEn valueTypes.String `json:"type_name_en"`
- UpdateDate valueTypes.String `json:"update_date"`
- ValidFlag valueTypes.Integer `json:"valid_flag"`
+ GoStructParent GoStruct.GoStructParent `json:"GoStruct" PointIdReplace:"true" DataTable:"true" DataTableSortOn:"UpdateDate"`
+
+ UpdateDate valueTypes.DateTime `json:"update_date"`
+ SysID valueTypes.String `json:"sys_id"`
+ SysName valueTypes.String `json:"sys_name"`
+ TypeID valueTypes.Integer `json:"type_id"`
+ TypeCode valueTypes.Integer `json:"type_code"`
+ TypeName valueTypes.String `json:"type_name"`
+ TypeNameEn valueTypes.String `json:"type_name_en"`
+ IsRemoteUpgrade valueTypes.Bool `json:"is_remote_upgrade"`
+ ValidFlag valueTypes.Bool `json:"valid_flag"`
}
func (e *ResultData) IsValid() error {
@@ -42,30 +43,11 @@ func (e *ResultData) IsValid() error {
return err
}
-//type DecodeResultData ResultData
-//
-//func (e *ResultData) UnmarshalJSON(data []byte) error {
-// var err error
-//
-// for range Only.Once {
-// if len(data) == 0 {
-// break
-// }
-// var pd DecodeResultData
-//
-// // Store ResultData
-// _ = json.Unmarshal(data, &pd)
-// e.Dummy = pd.Dummy
-// }
-//
-// return err
-//}
-
func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go
index b9727bf72..f5209b19a 100644
--- a/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerDeviceTypeList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go b/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go
index 2286ca580..f86019d02 100644
--- a/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerPlanList/data.go
@@ -50,7 +50,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go b/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go
index 0b0f87f5b..f8878205d 100644
--- a/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerPlanList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerStation/data.go b/iSolarCloud/WebIscmAppService/getPowerStation/data.go
index 4acf91b90..0fa93a21d 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStation/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStation/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerStation/struct.go b/iSolarCloud/WebIscmAppService/getPowerStation/struct.go
index e93a4636b..b31ea5901 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStation/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStation/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
index 226eba516..3d87b49d9 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStationInfo/data.go
@@ -1,6 +1,7 @@
package getPowerStationInfo
import (
+ "GoSungrow/iSolarCloud/Common"
"GoSungrow/iSolarCloud/api"
"GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
@@ -25,138 +26,141 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
+ RemindType Common.Unknown `json:"remindType" PointId:"remind_type"`
+
PsList []struct {
- BatteryPlateArea interface{} `json:"battery_plate_area"`
+ BatteryPlateArea Common.Unknown `json:"battery_plate_area"`
BatteryType valueTypes.Integer `json:"battery_type"`
- ConnectGrid interface{} `json:"connect_grid"`
- ContactMobile interface{} `json:"contact_mobile"`
- ContactMobileBak interface{} `json:"contact_mobile_bak"`
+ ConnectGrid Common.Unknown `json:"connect_grid"`
+ ContactMobile Common.Unknown `json:"contact_mobile"`
+ ContactMobileBak Common.Unknown `json:"contact_mobile_bak"`
ContactName valueTypes.String `json:"contact_name"`
- ContactTel interface{} `json:"contact_tel"`
+ ContactTel Common.Unknown `json:"contact_tel"`
CreateTime valueTypes.String `json:"create_time"`
CreateUserID valueTypes.Integer `json:"create_user_id"`
- DesignCapacity valueTypes.Integer `json:"design_capacity"`
- DesignCapacityBattery valueTypes.Integer `json:"design_capacity_battery"`
+ DesignCapacity valueTypes.Float `json:"design_capacity"`
+ DesignCapacityBattery valueTypes.Float `json:"design_capacity_battery"`
EquivalentHour valueTypes.Integer `json:"equivalent_hour"`
- GetCostCycle valueTypes.Integer `json:"get_cost_cycle"`
- InverterLoadSum interface{} `json:"inverter_load_sum"`
+ GetCostCycle valueTypes.Float `json:"get_cost_cycle"`
+ InverterLoadSum Common.Unknown `json:"inverter_load_sum"`
IsNewVersion valueTypes.String `json:"isNewVersion"`
IsAgreeGdpr valueTypes.String `json:"is_agree_gdpr"`
IsGdpr valueTypes.String `json:"is_gdpr"`
IsOpenProtocol valueTypes.String `json:"is_open_protocol"`
IsReceiveNotice valueTypes.String `json:"is_receive_notice"`
IsSharePosition valueTypes.String `json:"is_share_position"`
- MobleTel interface{} `json:"moble_tel" PointId:"mobile_tel"`
- Monetary interface{} `json:"monetary"`
- ParamCo2 float64 `json:"param_co2"`
- ParamConverRate valueTypes.Integer `json:"param_conver_rate"`
- ParamIncome valueTypes.Integer `json:"param_income"`
+ MobileTel Common.Unknown `json:"moble_tel" PointId:"mobile_tel"`
+ Monetary Common.Unknown `json:"monetary"`
+ ParamCo2 valueTypes.Float `json:"param_co2"`
+ ParamConvertRate valueTypes.Float `json:"param_conver_rate" PointId:"param_convert_rate"`
+ ParamIncome valueTypes.Float `json:"param_income"`
ParamIncomeUnit valueTypes.Integer `json:"param_income_unit"`
- ParamTemperature interface{} `json:"param_temperature"`
- ParamTree valueTypes.Integer `json:"param_tree"`
- PrAddition valueTypes.Integer `json:"pr_addition"`
- PrMax float64 `json:"pr_max"`
- PrMin valueTypes.Integer `json:"pr_min"`
- PrRatio valueTypes.Integer `json:"pr_ratio"`
+ ParamTemperature Common.Unknown `json:"param_temperature"`
+ ParamTree valueTypes.Float `json:"param_tree"`
+ PrAddition valueTypes.Float `json:"pr_addition"`
+ PrMax valueTypes.Float `json:"pr_max"`
+ PrMin valueTypes.Float `json:"pr_min"`
+ PrRatio valueTypes.Float `json:"pr_ratio"`
PsEmail valueTypes.String `json:"ps_email"`
- PsID valueTypes.Integer `json:"ps_id"`
+ PsId valueTypes.PsId `json:"ps_id"`
PsType valueTypes.Integer `json:"ps_type"`
- PwCost float64 `json:"pw_cost"`
- RadiationMax valueTypes.Integer `json:"radiation_max"`
+ PwCost valueTypes.Float `json:"pw_cost"`
+ RadiationMax valueTypes.Float `json:"radiation_max"`
UserAccount valueTypes.String `json:"user_account"`
UserEmail valueTypes.String `json:"user_email"`
UserName valueTypes.String `json:"user_name"`
- } `json:"psList"`
+ } `json:"psList" PointId:"ps_list" PointIdFromChild:"PsId" PointIdReplace:"true"`
+
PsMap struct {
- AccessType interface{} `json:"access_type"`
- AreaType interface{} `json:"area_type"`
- Areaid interface{} `json:"areaid"`
- BuildDate valueTypes.String `json:"build_date"`
- Buildstatus valueTypes.Integer `json:"buildstatus"`
- Capitaltype valueTypes.Integer `json:"capitaltype"`
- City interface{} `json:"city"`
- Country interface{} `json:"country"`
- CountyCode interface{} `json:"county_code"`
+ AccessType Common.Unknown `json:"access_type"`
+ AreaType Common.Unknown `json:"area_type"`
+ AreaId Common.Unknown `json:"areaid" PointId:"airea_id"`
+ BuildDate valueTypes.DateTime `json:"build_date"`
+ BuildStatus valueTypes.Integer `json:"buildstatus" PointId:"build_status"`
+ CapitalType valueTypes.Integer `json:"capitaltype" PointId:"capital_type"`
+ City Common.Unknown `json:"city"`
+ Country Common.Unknown `json:"country"`
+ CountyCode Common.Unknown `json:"county_code"`
DistrictFlag valueTypes.Integer `json:"district_flag"`
- DivisionCode interface{} `json:"division_code"`
- Email valueTypes.String `json:"email"`
- ExpectInstallDate valueTypes.String `json:"expect_install_date"`
- FaultSendType interface{} `json:"fault_send_type"`
- GcjLatitude valueTypes.String `json:"gcj_latitude"`
- GcjLongitude valueTypes.String `json:"gcj_longitude"`
- GprsLatitude interface{} `json:"gprs_latitude"`
- GprsLongitude interface{} `json:"gprs_longitude"`
- Installdate valueTypes.String `json:"installdate"`
+ DivisionCode Common.Unknown `json:"division_code"`
+ Email valueTypes.DateTime `json:"email"`
+ ExpectInstallDate valueTypes.DateTime `json:"expect_install_date"`
+ FaultSendType Common.Unknown `json:"fault_send_type"`
+ GcjLatitude valueTypes.Float `json:"gcj_latitude"`
+ GcjLongitude valueTypes.Float `json:"gcj_longitude"`
+ GprsLatitude valueTypes.Float `json:"gprs_latitude"`
+ GprsLongitude valueTypes.Float `json:"gprs_longitude"`
+ InstallDate valueTypes.DateTime `json:"installdate"`
InvestmentType valueTypes.Integer `json:"investment_type"`
- Latitude valueTypes.String `json:"latitude"`
- Longitude valueTypes.String `json:"longitude"`
- MapLatitude valueTypes.String `json:"map_latitude"`
- MapLongitude valueTypes.String `json:"map_longitude"`
- Montorurl interface{} `json:"montorurl"`
- Name interface{} `json:"name"`
- NameCode interface{} `json:"name_code"`
- Nation interface{} `json:"nation"`
- NationCode interface{} `json:"nation_code"`
+ Latitude valueTypes.Float `json:"latitude"`
+ Longitude valueTypes.Float `json:"longitude"`
+ MapLatitude valueTypes.Float `json:"map_latitude"`
+ MapLongitude valueTypes.Float `json:"map_longitude"`
+ MonitorUrl Common.Unknown `json:"montorurl" PointId:"monitor_url"`
+ Name Common.Unknown `json:"name"`
+ NameCode Common.Unknown `json:"name_code"`
+ Nation Common.Unknown `json:"nation"`
+ NationCode Common.Unknown `json:"nation_code"`
Nmi valueTypes.String `json:"nmi"`
- OperateYear interface{} `json:"operate_year"`
- Operationbusname interface{} `json:"operationbusname"`
- OrgIndexCode interface{} `json:"org_index_code"`
+ OperateYear Common.Unknown `json:"operate_year"`
+ OperationBusName Common.Unknown `json:"operationbusname" PointId:"operation_bus_name"`
+ OrgIndexCode Common.Unknown `json:"org_index_code"`
OrgIndexCodeName valueTypes.String `json:"org_index_code_name"`
- OrganizationID interface{} `json:"organization_id"`
- OrganizationName interface{} `json:"organization_name"`
- PanoramaLevel interface{} `json:"panorama_level"`
- Producer interface{} `json:"producer"`
- Prov interface{} `json:"prov"`
- ProvCode interface{} `json:"prov_code"`
- PsBuildDate valueTypes.String `json:"ps_build_date"`
+ OrganizationID Common.Unknown `json:"organization_id"`
+ OrganizationName Common.Unknown `json:"organization_name"`
+ PanoramaLevel Common.Unknown `json:"panorama_level"`
+ Producer Common.Unknown `json:"producer"`
+ Prov Common.Unknown `json:"prov"`
+ ProvCode Common.Unknown `json:"prov_code"`
+ PsBuildDate valueTypes.DateTime `json:"ps_build_date"`
PsCountryID valueTypes.Integer `json:"ps_country_id"`
- Pscode valueTypes.String `json:"pscode"`
- Psdesc interface{} `json:"psdesc"`
- Psguid valueTypes.String `json:"psguid"`
- Psholder valueTypes.String `json:"psholder"`
- Psid valueTypes.Integer `json:"psid"`
- Pslocation valueTypes.String `json:"pslocation"`
- Psname valueTypes.String `json:"psname"`
- Psnameenus interface{} `json:"psnameenus"`
- Psorgid interface{} `json:"psorgid"`
- Psorgname interface{} `json:"psorgname"`
- Pstype valueTypes.Integer `json:"pstype"`
- SafeStartDate valueTypes.String `json:"safe_start_date"`
- Schedulingtype valueTypes.Integer `json:"schedulingtype"`
+ PsCode valueTypes.String `json:"pscode" PointId:"ps_code"`
+ PsDesc Common.Unknown `json:"psdesc" PointId:"ps_desc"`
+ PsGuid valueTypes.String `json:"psguid" PointId:"ps_guid"`
+ PsHolder valueTypes.String `json:"psholder" PointId:"ps_holder"`
+ PsId valueTypes.Integer `json:"psid" PointId:"ps_id"`
+ PsLocation valueTypes.String `json:"pslocation" PointId:"remind_type"`
+ PsName valueTypes.String `json:"psname" PointId:"remind_type"`
+ PsNameEnus Common.Unknown `json:"psnameenus" PointId:"ps_name_enus"`
+ PsOrgId Common.Unknown `json:"psorgid" PointId:"ps_org_id"`
+ PsOrgName Common.Unknown `json:"psorgname" PointId:"ps_org_name"`
+ PsType valueTypes.Integer `json:"pstype" PointId:"ps_type"`
+ SafeStartDate valueTypes.DateTime `json:"safe_start_date"`
+ SchedulingType valueTypes.Integer `json:"schedulingtype" PointId:"scheduling_type"`
Shortname valueTypes.String `json:"shortname"`
Sn valueTypes.String `json:"sn"`
- Street interface{} `json:"street"`
- Sysscheme valueTypes.Integer `json:"sysscheme"`
+ Street Common.Unknown `json:"street"`
+ SysScheme valueTypes.Integer `json:"sysscheme" PointId:"sys_scheme"`
Timezone valueTypes.Integer `json:"timezone"`
- TownCode interface{} `json:"town_code"`
- Uploadprotocol valueTypes.Integer `json:"uploadprotocol"`
+ TownCode Common.Unknown `json:"town_code"`
+ UploadProtocol valueTypes.Integer `json:"uploadprotocol" PointId:"upload_protocol"`
UserAccount valueTypes.String `json:"user_account"`
- Validflag valueTypes.Integer `json:"validflag"`
- Videopath interface{} `json:"videopath"`
- VillageCode interface{} `json:"village_code"`
- WgsLatitude float64 `json:"wgs_latitude"`
- WgsLongitude float64 `json:"wgs_longitude"`
- } `json:"psMap"`
- RemindType interface{} `json:"remindType"`
+ ValidFlag valueTypes.Bool `json:"validflag" PointId:"valid_flag"`
+ VideoPath Common.Unknown `json:"videopath" PointId:"video_path"`
+ VillageCode Common.Unknown `json:"village_code"`
+ WgsLatitude valueTypes.Float `json:"wgs_latitude"`
+ WgsLongitude valueTypes.Float `json:"wgs_longitude"`
+ } `json:"psMap" PointId:"ps_map" PointIdFromChild:"PsId" PointIdReplace:"true"`
+
SnInfoList []struct {
- ChnnlDesc interface{} `json:"chnnl_desc" PointId:"channel_description"`
- ChnnlID valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"`
- ChnnlName valueTypes.String `json:"chnnl_name PointId:"channel_name"`
- CrtDate valueTypes.String `json:"crt_date" PointId:"create_date"`
- CrtUserName interface{} `json:"crt_user_name" PointId:"create_username"`
+ ChannelDesc Common.Unknown `json:"chnnl_desc" PointId:"channel_description"`
+ ChannelId valueTypes.Integer `json:"chnnl_id" PointId:"channel_id"`
+ ChannelName valueTypes.String `json:"chnnl_name PointId:"channel_name"`
+ CrtDate valueTypes.DateTime `json:"crt_date" PointId:"create_date"`
+ CrtUserName Common.Unknown `json:"crt_user_name" PointId:"create_username"`
DataFlag valueTypes.Integer `json:"data_flag"`
- FlagServer interface{} `json:"flag_server"`
- HostIP interface{} `json:"host_ip"`
+ FlagServer Common.Unknown `json:"flag_server"`
+ HostIP Common.Unknown `json:"host_ip"`
ID valueTypes.Integer `json:"id"`
- IsEnable valueTypes.Integer `json:"is_enable"`
- ProtocolType interface{} `json:"protocol_type"`
- PsGUID interface{} `json:"ps_guid"`
- PsID valueTypes.Integer `json:"ps_id"`
- Secrit valueTypes.String `json:"secrit"`
+ IsEnable valueTypes.Bool `json:"is_enable"`
+ ProtocolType Common.Unknown `json:"protocol_type"`
+ PsGUID Common.Unknown `json:"ps_guid"`
+ PsId valueTypes.PsId `json:"ps_id"`
+ Secret valueTypes.String `json:"secrit" PointId:"secret"`
Sn valueTypes.String `json:"sn"`
- TcpMode interface{} `json:"tcp_mode"`
- TcpPort interface{} `json:"tcp_port"`
- } `json:"snInfoList"`
+ TcpMode Common.Unknown `json:"tcp_mode"`
+ TcpPort Common.Unknown `json:"tcp_port"`
+ } `json:"snInfoList" PointId:"sn_info_list" PointIdFromChild:"PsId" PointIdReplace:"true"`
}
func (e *ResultData) IsValid() error {
@@ -169,7 +173,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go b/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go
index a5ebb9e99..974d8bfc9 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStationInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerStationList/data.go b/iSolarCloud/WebIscmAppService/getPowerStationList/data.go
index bd27395d2..76b46dab7 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStationList/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStationList/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go b/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go
index 11e29c9f0..0d36b2db8 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStationList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPowerStore/data.go b/iSolarCloud/WebIscmAppService/getPowerStore/data.go
index 34d727a28..57a98b4be 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStore/data.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStore/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPowerStore/struct.go b/iSolarCloud/WebIscmAppService/getPowerStore/struct.go
index 632edba40..db1d36d05 100644
--- a/iSolarCloud/WebIscmAppService/getPowerStore/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPowerStore/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getProvcnNew/data.go b/iSolarCloud/WebIscmAppService/getProvcnNew/data.go
index 35ec1faf1..24ef6b472 100644
--- a/iSolarCloud/WebIscmAppService/getProvcnNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getProvcnNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go b/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go
index b13eb3f9b..ba253b154 100644
--- a/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getProvcnNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go b/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go
index 5b999cdb1..17b24e667 100644
--- a/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getPsTreeMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go b/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go
index f945df991..bb023ad89 100644
--- a/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getPsTreeMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go b/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go
index 7a9ebbd60..0958f3db5 100644
--- a/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go
+++ b/iSolarCloud/WebIscmAppService/getRoleByUserIds/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go b/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go
index d80abce18..e539015b1 100644
--- a/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go
+++ b/iSolarCloud/WebIscmAppService/getRoleByUserIds/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go
index 1f0751dff..342e6fdb4 100644
--- a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go
+++ b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go
index 75b913660..8e10b41d8 100644
--- a/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go
+++ b/iSolarCloud/WebIscmAppService/getRootOrgInfoByUserId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go b/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go
index ab07efbec..ddeff7484 100644
--- a/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go
+++ b/iSolarCloud/WebIscmAppService/getSettingUserMapData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go b/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go
index 2d95d3a66..f9610c9f5 100644
--- a/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSettingUserMapData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getStateNew/data.go b/iSolarCloud/WebIscmAppService/getStateNew/data.go
index 7c6853c3a..9523caf46 100644
--- a/iSolarCloud/WebIscmAppService/getStateNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getStateNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getStateNew/struct.go b/iSolarCloud/WebIscmAppService/getStateNew/struct.go
index 901cf63be..1c1ccf871 100644
--- a/iSolarCloud/WebIscmAppService/getStateNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getStateNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go b/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go
index a3a66d8ce..df07ef63f 100644
--- a/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/getSubTypeDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go b/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go
index 4bb6dc6f3..de63169f5 100644
--- a/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSubTypeDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go b/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go
index 15134ac2f..99df5f4b3 100644
--- a/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go
+++ b/iSolarCloud/WebIscmAppService/getSysHomeList2/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go b/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go
index 666d9030e..d50b65247 100644
--- a/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSysHomeList2/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSysMenu/data.go b/iSolarCloud/WebIscmAppService/getSysMenu/data.go
index c20549bcf..1172f2067 100644
--- a/iSolarCloud/WebIscmAppService/getSysMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getSysMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getSysMenu/struct.go
index 84b5a0186..45eae032f 100644
--- a/iSolarCloud/WebIscmAppService/getSysMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSysMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go b/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go
index eebd5f356..655faa60e 100644
--- a/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go
+++ b/iSolarCloud/WebIscmAppService/getSysOrgPro/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go b/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go
index b07f967c2..d4ee0840b 100644
--- a/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSysOrgPro/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSysUser/data.go b/iSolarCloud/WebIscmAppService/getSysUser/data.go
index e1d602168..6bbecbe36 100644
--- a/iSolarCloud/WebIscmAppService/getSysUser/data.go
+++ b/iSolarCloud/WebIscmAppService/getSysUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSysUser/struct.go b/iSolarCloud/WebIscmAppService/getSysUser/struct.go
index ec48070fd..a787f7718 100644
--- a/iSolarCloud/WebIscmAppService/getSysUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSysUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go
index 5935acc4d..951170db6 100644
--- a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go
index 0ba8c2e02..3db698dc7 100644
--- a/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSystemOrgInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go
index 5d7fb1863..4be5743e1 100644
--- a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go
index a231c9684..1884d1351 100644
--- a/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSystemRoleInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go b/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go
index 3f369a1c8..52660b15d 100644
--- a/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go
+++ b/iSolarCloud/WebIscmAppService/getSystemRoleList2/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go b/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go
index 4a310746f..ad2ad24ca 100644
--- a/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go
+++ b/iSolarCloud/WebIscmAppService/getSystemRoleList2/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getTownValueNew/data.go b/iSolarCloud/WebIscmAppService/getTownValueNew/data.go
index d5ab0bf31..296ac551d 100644
--- a/iSolarCloud/WebIscmAppService/getTownValueNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getTownValueNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go b/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go
index fe931ca6a..f5a9337b6 100644
--- a/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getTownValueNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go b/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go
index 5606c755c..aa662417b 100644
--- a/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go
+++ b/iSolarCloud/WebIscmAppService/getUserMenuLs/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go b/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go
index 8a79eae78..c9707b1ea 100644
--- a/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go
+++ b/iSolarCloud/WebIscmAppService/getUserMenuLs/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go b/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go
index c7ab63e90..5b4106f09 100644
--- a/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go
+++ b/iSolarCloud/WebIscmAppService/getUserOrgPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go b/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go
index 32117d9d6..4e495c743 100644
--- a/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/getUserOrgPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getVillageList/data.go b/iSolarCloud/WebIscmAppService/getVillageList/data.go
index 839abe93a..4c7bc1972 100644
--- a/iSolarCloud/WebIscmAppService/getVillageList/data.go
+++ b/iSolarCloud/WebIscmAppService/getVillageList/data.go
@@ -39,7 +39,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getVillageList/struct.go b/iSolarCloud/WebIscmAppService/getVillageList/struct.go
index 2898a0c85..13ae736f5 100644
--- a/iSolarCloud/WebIscmAppService/getVillageList/struct.go
+++ b/iSolarCloud/WebIscmAppService/getVillageList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getVillageListNew/data.go b/iSolarCloud/WebIscmAppService/getVillageListNew/data.go
index 7a430d1b8..8743951d2 100644
--- a/iSolarCloud/WebIscmAppService/getVillageListNew/data.go
+++ b/iSolarCloud/WebIscmAppService/getVillageListNew/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go b/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go
index 39f548515..9cbca8327 100644
--- a/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go
+++ b/iSolarCloud/WebIscmAppService/getVillageListNew/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go
index 7ed61c147..a5f664a5f 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go
index f6146c786..b5c3cbd21 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeAsyncSysMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go
index f043e1722..c1c7a1b9e 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go
index e88ed954f..56b5bafc9 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeChildMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go
index 076cbc254..82a181fbc 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go
index dee2cc319..fb822d091 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go
index c79ec2429..3dafdf4da 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go
index d9860cd30..c2152814e 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go
index cdcd8e169..d66564137 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go
index 537c343e0..45cd006b1 100644
--- a/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go
+++ b/iSolarCloud/WebIscmAppService/getZtreeSysMenu2/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go
index ee367a792..d2019aba6 100644
--- a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go
+++ b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go
index 013b2e1b8..c9c086ee7 100644
--- a/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/goToDevicePropertyPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/isCanAddUser/data.go b/iSolarCloud/WebIscmAppService/isCanAddUser/data.go
index 96ae1c104..b0e1148ad 100644
--- a/iSolarCloud/WebIscmAppService/isCanAddUser/data.go
+++ b/iSolarCloud/WebIscmAppService/isCanAddUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go b/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go
index ec0c3c75f..0148482d4 100644
--- a/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/isCanAddUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go b/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go
index 9bb8b0737..c21a714b5 100644
--- a/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go
+++ b/iSolarCloud/WebIscmAppService/isHasIrradiationData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go
index 945cc686c..1cd646d44 100644
--- a/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go
+++ b/iSolarCloud/WebIscmAppService/isHasIrradiationData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/isHasPlan/data.go b/iSolarCloud/WebIscmAppService/isHasPlan/data.go
index 6cfd9b20e..24e96004e 100644
--- a/iSolarCloud/WebIscmAppService/isHasPlan/data.go
+++ b/iSolarCloud/WebIscmAppService/isHasPlan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/isHasPlan/struct.go b/iSolarCloud/WebIscmAppService/isHasPlan/struct.go
index 5591f91d9..7172d9b92 100644
--- a/iSolarCloud/WebIscmAppService/isHasPlan/struct.go
+++ b/iSolarCloud/WebIscmAppService/isHasPlan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/loadDevice/data.go b/iSolarCloud/WebIscmAppService/loadDevice/data.go
index 0a9179cf9..bba8abd77 100644
--- a/iSolarCloud/WebIscmAppService/loadDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/loadDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/loadDevice/struct.go b/iSolarCloud/WebIscmAppService/loadDevice/struct.go
index 6460f3dff..6e7da3260 100644
--- a/iSolarCloud/WebIscmAppService/loadDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/loadDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modelPointsPage/data.go b/iSolarCloud/WebIscmAppService/modelPointsPage/data.go
index 1dc2f0dee..c2ffe7724 100644
--- a/iSolarCloud/WebIscmAppService/modelPointsPage/data.go
+++ b/iSolarCloud/WebIscmAppService/modelPointsPage/data.go
@@ -26,12 +26,9 @@ func (rd RequestData) Help() string {
}
type ResultData struct {
- ModelList []struct {
- DeviceModelId valueTypes.Integer `json:"device_model_id"`
- DeviceModel valueTypes.String `json:"device_model"`
- DeviceModelCode valueTypes.String `json:"device_model_code"`
- } `json:"modelList" PointId:"model_list" DataTable:"true" DataTableSortOn:"DeviceModelId"`
PointList []struct {
+ GoStructParent GoStruct.GoStructParent `json:"-" DataTable:"true" DataTableSortOn:"PointId" PointIdFromChild:"PointId" PointIdReplace:"false"`
+
PointId valueTypes.Integer `json:"point_id"`
PointName valueTypes.String `json:"point_name"`
CodeId valueTypes.Integer `json:"code_id"`
@@ -39,7 +36,14 @@ type ResultData struct {
IsShow valueTypes.Bool `json:"is_show"`
IsSupportSecondData valueTypes.Bool `json:"is_support_second_data"`
OrderNum valueTypes.Integer `json:"order_num"`
- } `json:"pointList" PointId:"point_list" DataTable:"true" DataTableSortOn:"PointId"`
+ } `json:"pointList" PointId:"point_list"` // DataTable:"true" DataTableSortOn:"PointId" PointIdFromChild:"PointId" PointIdReplace:"false"`
+ ModelList []struct {
+ GoStruct GoStruct.GoStructParent `json:"GoStruct" DataTable:"true" DataTableSortOn:"DeviceModelId" PointIdFromChild:"DeviceModelId" PointIdReplace:"false"`
+
+ DeviceModelId valueTypes.Integer `json:"device_model_id"`
+ DeviceModel valueTypes.String `json:"device_model"`
+ DeviceModelCode valueTypes.String `json:"device_model_code"`
+ } `json:"modelList" PointId:"model_list"` // DataTable:"true" DataTableSortOn:"DeviceModelId" PointIdFromChild:"DeviceModelId" PointIdReplace:"false"`
}
func (e *ResultData) IsValid() error {
@@ -52,7 +56,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go b/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go
index ba6f2058c..2847e80ca 100644
--- a/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/modelPointsPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifyDevice/data.go b/iSolarCloud/WebIscmAppService/modifyDevice/data.go
index 1d2f7fe1a..9b7f38a84 100644
--- a/iSolarCloud/WebIscmAppService/modifyDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/modifyDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifyDevice/struct.go b/iSolarCloud/WebIscmAppService/modifyDevice/struct.go
index 13a256c5c..9b6ce79de 100644
--- a/iSolarCloud/WebIscmAppService/modifyDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifyDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go
index 4963a8096..5f0c48e15 100644
--- a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go
+++ b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go
index 60a7f7dd8..35abd99a8 100644
--- a/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifyPowerDeviceChannl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifySysOrg/data.go b/iSolarCloud/WebIscmAppService/modifySysOrg/data.go
index 77a567aea..1636ed15b 100644
--- a/iSolarCloud/WebIscmAppService/modifySysOrg/data.go
+++ b/iSolarCloud/WebIscmAppService/modifySysOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go b/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go
index d6a3b34c6..8738a191d 100644
--- a/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifySysOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go b/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go
index 9fb35980b..a955d8c2a 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go b/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go
index f51586a9e..230c36900 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go
index 1f5d0a16c..0afabb160 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go
index 0ed63f43c..763bf48d1 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemOrgNode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifySystemRole/data.go b/iSolarCloud/WebIscmAppService/modifySystemRole/data.go
index 9f0be2795..1abbcdbcc 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemRole/data.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemRole/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go b/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go
index d2bc4ad88..a284c8081 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemRole/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/modifySystemUser/data.go b/iSolarCloud/WebIscmAppService/modifySystemUser/data.go
index 1bd2afa63..407d4120c 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemUser/data.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go b/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go
index 971b2ec6d..34c80fbe4 100644
--- a/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/modifySystemUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/publishNotice/data.go b/iSolarCloud/WebIscmAppService/publishNotice/data.go
index 92abd6b79..d0da2dc2d 100644
--- a/iSolarCloud/WebIscmAppService/publishNotice/data.go
+++ b/iSolarCloud/WebIscmAppService/publishNotice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/publishNotice/struct.go b/iSolarCloud/WebIscmAppService/publishNotice/struct.go
index a329dfe83..8709d6d3f 100644
--- a/iSolarCloud/WebIscmAppService/publishNotice/struct.go
+++ b/iSolarCloud/WebIscmAppService/publishNotice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/queryDeviceList/data.go b/iSolarCloud/WebIscmAppService/queryDeviceList/data.go
index 61adf41a8..a25616b49 100644
--- a/iSolarCloud/WebIscmAppService/queryDeviceList/data.go
+++ b/iSolarCloud/WebIscmAppService/queryDeviceList/data.go
@@ -65,7 +65,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/queryDeviceList/struct.go b/iSolarCloud/WebIscmAppService/queryDeviceList/struct.go
index b6fad25b9..f96d2295b 100644
--- a/iSolarCloud/WebIscmAppService/queryDeviceList/struct.go
+++ b/iSolarCloud/WebIscmAppService/queryDeviceList/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/queryDutyType/data.go b/iSolarCloud/WebIscmAppService/queryDutyType/data.go
index 85e110924..657526308 100644
--- a/iSolarCloud/WebIscmAppService/queryDutyType/data.go
+++ b/iSolarCloud/WebIscmAppService/queryDutyType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/queryDutyType/struct.go b/iSolarCloud/WebIscmAppService/queryDutyType/struct.go
index b80f4b70e..900a0437e 100644
--- a/iSolarCloud/WebIscmAppService/queryDutyType/struct.go
+++ b/iSolarCloud/WebIscmAppService/queryDutyType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/queryReportDataById/data.go b/iSolarCloud/WebIscmAppService/queryReportDataById/data.go
index ffd7e9128..d851dfade 100644
--- a/iSolarCloud/WebIscmAppService/queryReportDataById/data.go
+++ b/iSolarCloud/WebIscmAppService/queryReportDataById/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go b/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go
index 6ce05d5bc..bae96bbaa 100644
--- a/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go
+++ b/iSolarCloud/WebIscmAppService/queryReportDataById/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/resetPasW/data.go b/iSolarCloud/WebIscmAppService/resetPasW/data.go
index a0c6edf80..214e27a85 100644
--- a/iSolarCloud/WebIscmAppService/resetPasW/data.go
+++ b/iSolarCloud/WebIscmAppService/resetPasW/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/resetPasW/struct.go b/iSolarCloud/WebIscmAppService/resetPasW/struct.go
index 16872f51c..f0fae132f 100644
--- a/iSolarCloud/WebIscmAppService/resetPasW/struct.go
+++ b/iSolarCloud/WebIscmAppService/resetPasW/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveAuthKey/data.go b/iSolarCloud/WebIscmAppService/saveAuthKey/data.go
index 3a4f1573e..00340244f 100644
--- a/iSolarCloud/WebIscmAppService/saveAuthKey/data.go
+++ b/iSolarCloud/WebIscmAppService/saveAuthKey/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go b/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go
index 05c40ae6f..da6eb0f78 100644
--- a/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveAuthKey/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveDevice/data.go b/iSolarCloud/WebIscmAppService/saveDevice/data.go
index 41f58f5b1..8de19dea3 100644
--- a/iSolarCloud/WebIscmAppService/saveDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/saveDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveDevice/struct.go b/iSolarCloud/WebIscmAppService/saveDevice/struct.go
index da0e22881..19d7956bd 100644
--- a/iSolarCloud/WebIscmAppService/saveDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go b/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go
index 7ccc01228..2caa864e1 100644
--- a/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go
+++ b/iSolarCloud/WebIscmAppService/saveDeviceFactory/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go b/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go
index b1faeb4ed..c7accdb8f 100644
--- a/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveDeviceFactory/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveDeviceType/data.go b/iSolarCloud/WebIscmAppService/saveDeviceType/data.go
index 4bef98066..53fac40bb 100644
--- a/iSolarCloud/WebIscmAppService/saveDeviceType/data.go
+++ b/iSolarCloud/WebIscmAppService/saveDeviceType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go b/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go
index 82a7ddbd1..582056b65 100644
--- a/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveDeviceType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go b/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go
index d86f8faf0..887391fcf 100644
--- a/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go
+++ b/iSolarCloud/WebIscmAppService/saveIrradiationData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go
index 167c90663..fea63f04c 100644
--- a/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveIrradiationData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveModelPoints/data.go b/iSolarCloud/WebIscmAppService/saveModelPoints/data.go
index 69b544cc4..4d77c79c6 100644
--- a/iSolarCloud/WebIscmAppService/saveModelPoints/data.go
+++ b/iSolarCloud/WebIscmAppService/saveModelPoints/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go b/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go
index a6ec5d5a9..94476b316 100644
--- a/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveModelPoints/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveNewNotice/data.go b/iSolarCloud/WebIscmAppService/saveNewNotice/data.go
index 1ebd28c36..5df880c48 100644
--- a/iSolarCloud/WebIscmAppService/saveNewNotice/data.go
+++ b/iSolarCloud/WebIscmAppService/saveNewNotice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go b/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go
index cb2edb043..e1339f3c3 100644
--- a/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveNewNotice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go
index b8f24c299..149632daf 100644
--- a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go
+++ b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go
index 65c4ca931..9c2a54da6 100644
--- a/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveOrUpdateReport/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveOrgNode/data.go b/iSolarCloud/WebIscmAppService/saveOrgNode/data.go
index cd1397211..3668d6e57 100644
--- a/iSolarCloud/WebIscmAppService/saveOrgNode/data.go
+++ b/iSolarCloud/WebIscmAppService/saveOrgNode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go b/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go
index db4375a9b..f902db2f8 100644
--- a/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveOrgNode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go b/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go
index b58f09dda..98e9a5f2e 100644
--- a/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go
+++ b/iSolarCloud/WebIscmAppService/saveOrgUsers/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go b/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go
index 9009d27e3..68aa1dc10 100644
--- a/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveOrgUsers/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePicture/data.go b/iSolarCloud/WebIscmAppService/savePicture/data.go
index 727f60eef..27bc93f6d 100644
--- a/iSolarCloud/WebIscmAppService/savePicture/data.go
+++ b/iSolarCloud/WebIscmAppService/savePicture/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePicture/struct.go b/iSolarCloud/WebIscmAppService/savePicture/struct.go
index 273aad9fc..bdad9b411 100644
--- a/iSolarCloud/WebIscmAppService/savePicture/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePicture/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePointManage/data.go b/iSolarCloud/WebIscmAppService/savePointManage/data.go
index b15ffd6a4..edbd13c90 100644
--- a/iSolarCloud/WebIscmAppService/savePointManage/data.go
+++ b/iSolarCloud/WebIscmAppService/savePointManage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePointManage/struct.go b/iSolarCloud/WebIscmAppService/savePointManage/struct.go
index 8d21dad10..3ebe0e9ef 100644
--- a/iSolarCloud/WebIscmAppService/savePointManage/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePointManage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go
index 4d60b99e2..f0eb2f3f9 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go
index 8025361b6..774ac4644 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceChannl/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go
index 7d876b766..c6e5f6c17 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go
index 9efdefc16..e12df9de3 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go
index f548f3554..0db68b7b2 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go
index e9fc88fca..89ca6aaa0 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceParameterPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go
index c9ec8d0d2..638a7ed3f 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go
index 756cfc731..156c0d3db 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceSubType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go
index e67a815d2..8a342062d 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go
index b3917b237..39a232f51 100644
--- a/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerDeviceTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerPlan/data.go b/iSolarCloud/WebIscmAppService/savePowerPlan/data.go
index 4e4a8c4fa..0cbb63d0c 100644
--- a/iSolarCloud/WebIscmAppService/savePowerPlan/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerPlan/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go b/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go
index 8e8d56d30..e54cab54d 100644
--- a/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerPlan/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go
index 8c02d61d6..0a5a0ec2b 100644
--- a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go
index cc0701cc3..b251bbafb 100644
--- a/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerStationByPowerStore/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePowerStore/data.go b/iSolarCloud/WebIscmAppService/savePowerStore/data.go
index a0db4d038..9e5e243b4 100644
--- a/iSolarCloud/WebIscmAppService/savePowerStore/data.go
+++ b/iSolarCloud/WebIscmAppService/savePowerStore/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePowerStore/struct.go b/iSolarCloud/WebIscmAppService/savePowerStore/struct.go
index da75a7754..ec778cc8b 100644
--- a/iSolarCloud/WebIscmAppService/savePowerStore/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePowerStore/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/savePsOrg/data.go b/iSolarCloud/WebIscmAppService/savePsOrg/data.go
index 5b11496dd..a18ef62b4 100644
--- a/iSolarCloud/WebIscmAppService/savePsOrg/data.go
+++ b/iSolarCloud/WebIscmAppService/savePsOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/savePsOrg/struct.go b/iSolarCloud/WebIscmAppService/savePsOrg/struct.go
index c5e3f3e1d..649e64a19 100644
--- a/iSolarCloud/WebIscmAppService/savePsOrg/struct.go
+++ b/iSolarCloud/WebIscmAppService/savePsOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveRelDevice/data.go b/iSolarCloud/WebIscmAppService/saveRelDevice/data.go
index d27faebab..8b62396e7 100644
--- a/iSolarCloud/WebIscmAppService/saveRelDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/saveRelDevice/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go b/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go
index 1f6e761ee..404b66606 100644
--- a/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveRelDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go b/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go
index a1244aea6..2a19e7b09 100644
--- a/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go
+++ b/iSolarCloud/WebIscmAppService/saveRoleAssign/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go b/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go
index 2f42615f5..c2e49ff60 100644
--- a/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveRoleAssign/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveSysMenu/data.go b/iSolarCloud/WebIscmAppService/saveSysMenu/data.go
index 044048189..8b7f691c7 100644
--- a/iSolarCloud/WebIscmAppService/saveSysMenu/data.go
+++ b/iSolarCloud/WebIscmAppService/saveSysMenu/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go b/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go
index 30b464904..a2bc35e71 100644
--- a/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveSysMenu/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveSysOrg/data.go b/iSolarCloud/WebIscmAppService/saveSysOrg/data.go
index 0efceab9f..b8c1f84d8 100644
--- a/iSolarCloud/WebIscmAppService/saveSysOrg/data.go
+++ b/iSolarCloud/WebIscmAppService/saveSysOrg/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go b/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go
index 0ba91dba1..bf460f6f4 100644
--- a/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveSysOrg/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveSysRole/data.go b/iSolarCloud/WebIscmAppService/saveSysRole/data.go
index 366ea2579..335733148 100644
--- a/iSolarCloud/WebIscmAppService/saveSysRole/data.go
+++ b/iSolarCloud/WebIscmAppService/saveSysRole/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveSysRole/struct.go b/iSolarCloud/WebIscmAppService/saveSysRole/struct.go
index 0bfc103dc..2084f58cc 100644
--- a/iSolarCloud/WebIscmAppService/saveSysRole/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveSysRole/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveSysUser/data.go b/iSolarCloud/WebIscmAppService/saveSysUser/data.go
index 1bac33978..3f3c220e2 100644
--- a/iSolarCloud/WebIscmAppService/saveSysUser/data.go
+++ b/iSolarCloud/WebIscmAppService/saveSysUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveSysUser/struct.go b/iSolarCloud/WebIscmAppService/saveSysUser/struct.go
index 84e6cc42e..c2ee3f326 100644
--- a/iSolarCloud/WebIscmAppService/saveSysUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveSysUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveUserNode/data.go b/iSolarCloud/WebIscmAppService/saveUserNode/data.go
index 9b279a0a7..ad033717d 100644
--- a/iSolarCloud/WebIscmAppService/saveUserNode/data.go
+++ b/iSolarCloud/WebIscmAppService/saveUserNode/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveUserNode/struct.go b/iSolarCloud/WebIscmAppService/saveUserNode/struct.go
index 121b6db9a..909a86946 100644
--- a/iSolarCloud/WebIscmAppService/saveUserNode/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveUserNode/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/saveUserRole/data.go b/iSolarCloud/WebIscmAppService/saveUserRole/data.go
index e332c6014..16a1503c7 100644
--- a/iSolarCloud/WebIscmAppService/saveUserRole/data.go
+++ b/iSolarCloud/WebIscmAppService/saveUserRole/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/saveUserRole/struct.go b/iSolarCloud/WebIscmAppService/saveUserRole/struct.go
index 69caef42b..a7c145eef 100644
--- a/iSolarCloud/WebIscmAppService/saveUserRole/struct.go
+++ b/iSolarCloud/WebIscmAppService/saveUserRole/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go b/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go
index 7f1c4e1ee..9de9ae219 100644
--- a/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go
+++ b/iSolarCloud/WebIscmAppService/searchIrradiationData/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go b/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go
index 2e89b3193..90f36368b 100644
--- a/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go
+++ b/iSolarCloud/WebIscmAppService/searchIrradiationData/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go b/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go
index 10ea5b600..8d691026c 100644
--- a/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go
+++ b/iSolarCloud/WebIscmAppService/searchTechnicalNums/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go b/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go
index 96b6f6baa..9a6788e0a 100644
--- a/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go
+++ b/iSolarCloud/WebIscmAppService/searchTechnicalNums/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go
index f120ddadb..e698eddcb 100644
--- a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go
+++ b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go
index 55b85359d..4bdf4f59f 100644
--- a/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go
+++ b/iSolarCloud/WebIscmAppService/selectDeviceTypeByPsId/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go
index 9b53653cf..d85db44ab 100644
--- a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go
+++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go
index 6d58f6909..a4d4f8090 100644
--- a/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go
+++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceTechnicals/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go
index f4bd5c759..6b5be9ed9 100644
--- a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go
+++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go
index 35ec012f8..11282af94 100644
--- a/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go
+++ b/iSolarCloud/WebIscmAppService/selectPowerDeviceType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go
index 748f6cf68..640b527de 100644
--- a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go
+++ b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go
index 36a160e2b..b7cfcf80b 100644
--- a/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go
+++ b/iSolarCloud/WebIscmAppService/setupUserRole4AddUser/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/startWorkFlow/data.go b/iSolarCloud/WebIscmAppService/startWorkFlow/data.go
index efb08c77a..d9ba8d62c 100644
--- a/iSolarCloud/WebIscmAppService/startWorkFlow/data.go
+++ b/iSolarCloud/WebIscmAppService/startWorkFlow/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go b/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go
index 2a69c32be..e8df51548 100644
--- a/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go
+++ b/iSolarCloud/WebIscmAppService/startWorkFlow/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateDevice/data.go b/iSolarCloud/WebIscmAppService/updateDevice/data.go
index 9c78cf93e..e8f6b60c4 100644
--- a/iSolarCloud/WebIscmAppService/updateDevice/data.go
+++ b/iSolarCloud/WebIscmAppService/updateDevice/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateDevice/struct.go b/iSolarCloud/WebIscmAppService/updateDevice/struct.go
index 743cf86ac..81f09c3cd 100644
--- a/iSolarCloud/WebIscmAppService/updateDevice/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateDevice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateDeviceType/data.go b/iSolarCloud/WebIscmAppService/updateDeviceType/data.go
index 0e1ba9bfd..e68846ead 100644
--- a/iSolarCloud/WebIscmAppService/updateDeviceType/data.go
+++ b/iSolarCloud/WebIscmAppService/updateDeviceType/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go b/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go
index e17818584..f88220b55 100644
--- a/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateDeviceType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go b/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go
index 71d0095b9..2f54902a4 100644
--- a/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go
+++ b/iSolarCloud/WebIscmAppService/updateFaultLevel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go b/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go
index 80bef5369..eb4f92d91 100644
--- a/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateFaultLevel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateNotice/data.go b/iSolarCloud/WebIscmAppService/updateNotice/data.go
index ea2618ede..0875cf2f0 100644
--- a/iSolarCloud/WebIscmAppService/updateNotice/data.go
+++ b/iSolarCloud/WebIscmAppService/updateNotice/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateNotice/struct.go b/iSolarCloud/WebIscmAppService/updateNotice/struct.go
index 39409f733..eecbb4624 100644
--- a/iSolarCloud/WebIscmAppService/updateNotice/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateNotice/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updatePointInfo/data.go b/iSolarCloud/WebIscmAppService/updatePointInfo/data.go
index 78ea68b04..ed3c469c1 100644
--- a/iSolarCloud/WebIscmAppService/updatePointInfo/data.go
+++ b/iSolarCloud/WebIscmAppService/updatePointInfo/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go b/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go
index 2b337157e..35f022f20 100644
--- a/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go
+++ b/iSolarCloud/WebIscmAppService/updatePointInfo/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go
index fadfed68e..72af16e98 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go
index 04f6c2b01..54d2b2023 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceModel/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go
index 8d7afc20f..2de3cab36 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go
index 30339d7bf..4728064a3 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceParameterPage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go
index 3d8ba362e..829a5358d 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go
index 087a00290..80958f51c 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceSubType/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go
index e9a9867b8..ffc72a885 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go
index fbe71a5ec..fb13550bb 100644
--- a/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go
+++ b/iSolarCloud/WebIscmAppService/updatePowerDeviceTechnical/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateProcessManage/data.go b/iSolarCloud/WebIscmAppService/updateProcessManage/data.go
index 1920e4ffc..3d92e9c81 100644
--- a/iSolarCloud/WebIscmAppService/updateProcessManage/data.go
+++ b/iSolarCloud/WebIscmAppService/updateProcessManage/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go b/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go
index 9b2b6cc66..577a78faa 100644
--- a/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateProcessManage/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go b/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go
index b2541fadb..f0785bfff 100644
--- a/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go
+++ b/iSolarCloud/WebIscmAppService/updateSysOrgPro/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go b/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go
index 0d1b8abc3..c5128b555 100644
--- a/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateSysOrgPro/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go
index 75d652f17..083958a37 100644
--- a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go
+++ b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go
index 4cc2e0a2e..c5d5c6f5d 100644
--- a/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateSysRoleValidFlag/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go
index c6a253189..d9c024419 100644
--- a/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go
+++ b/iSolarCloud/WebIscmAppService/updateUserValidFlag/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go
index 4a8b5b2e1..035e4feec 100644
--- a/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateUserValidFlag/struct.go
@@ -36,7 +36,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/updateValidFlag/data.go b/iSolarCloud/WebIscmAppService/updateValidFlag/data.go
index 1796f9c66..0d624a05c 100644
--- a/iSolarCloud/WebIscmAppService/updateValidFlag/data.go
+++ b/iSolarCloud/WebIscmAppService/updateValidFlag/data.go
@@ -39,7 +39,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go b/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go
index 07cb31f6d..d994be396 100644
--- a/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go
+++ b/iSolarCloud/WebIscmAppService/updateValidFlag/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go b/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go
index d0eb86e8c..07f8ce2c7 100644
--- a/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go
+++ b/iSolarCloud/WebIscmAppService/viewDeviceModel/data.go
@@ -73,7 +73,7 @@ func (e *EndPoint) GetData() api.DataMap {
// pkg := reflection.GetName("", *e)
// dt := valueTypes.NewDateTime(valueTypes.Now)
// name := pkg + "." + e.Request.PsId.String()
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go b/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go
index d552c8356..d012e0280 100644
--- a/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go
+++ b/iSolarCloud/WebIscmAppService/viewDeviceModel/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go b/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go
index bc9a17ab3..5fe1fd318 100644
--- a/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go
+++ b/iSolarCloud/WebIscmAppService/viewDeviceParameter/data.go
@@ -82,7 +82,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go b/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go
index 51faf0fec..d2e6df644 100644
--- a/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go
+++ b/iSolarCloud/WebIscmAppService/viewDeviceParameter/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go b/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go
index 25049fac3..325b69206 100644
--- a/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go
+++ b/iSolarCloud/WebIscmAppService/workFlowImplementStep/data.go
@@ -57,7 +57,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go b/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go
index 4e96da69a..6f5d8117d 100644
--- a/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go
+++ b/iSolarCloud/WebIscmAppService/workFlowImplementStep/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go b/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go
index 5469ac602..0e16af5ff 100644
--- a/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go
+++ b/iSolarCloud/WebIscmAppService/workFlowIsStart/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go b/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go
index 77542e919..5546c2106 100644
--- a/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go
+++ b/iSolarCloud/WebIscmAppService/workFlowIsStart/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go b/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go
index 8d83dbd82..c8778b58d 100644
--- a/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go
+++ b/iSolarCloud/WebIscmAppService/workFlowTransferStep/data.go
@@ -38,7 +38,7 @@ func (e *EndPoint) GetData() api.DataMap {
entries := api.NewDataMap()
for range Only.Once {
- entries.StructToDataMap(*e, "system", GoStruct.EndPointPath{})
+ entries.StructToDataMap(*e, "", GoStruct.EndPointPath{})
}
return entries
diff --git a/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go b/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go
index 53f36b943..75e709a41 100644
--- a/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go
+++ b/iSolarCloud/WebIscmAppService/workFlowTransferStep/struct.go
@@ -35,7 +35,7 @@ type Request struct {
// Response - Holds the api.ResponseCommon and endpoint specific ResultData structures. See data.go for response fields.
type Response struct {
api.ResponseCommon
- ResultData ResultData `json:"result_data" PointNameAppend:"false"`
+ ResultData ResultData `json:"result_data" PointIdReplace:"true"`
}
// Init - Used to initialize a new endpoint instance. Usually called from an area.
diff --git a/iSolarCloud/api/GoStruct/const.go b/iSolarCloud/api/GoStruct/const.go
index 0af7b60ff..56e0a6d04 100644
--- a/iSolarCloud/api/GoStruct/const.go
+++ b/iSolarCloud/api/GoStruct/const.go
@@ -7,11 +7,27 @@ const (
// NameGoStruct - Name of field within structure that allows for assigning tags to the parent.
// Add like this:
// type ResultData []struct {
- // GoStruct GoStruct.GoStruct `json:"GoStruct" DataTable:"true" DataTableSortOn:"UnitConvertId"`
+ // GoStruct GoStruct.GoStruct `json:"-" DataTable:"true" DataTableSortOn:"UnitConvertId"`
+ //
+ // ...
+ //
+ // }
NameGoStruct = "GoStruct"
+ PkgGoStruct = "GoStruct.GoStruct"
+ NameGoStructParent = "GoStructParent"
+ PkgGoStructParent = "GoStruct.GoStructParent"
// PointId - Point id in the form p\d+ or \d+ or free-form text.
PointId = "PointId"
+ // PointIdFrom - Searches current structure for field value to use for naming when hitting a slice, (as opposed to using an index).
+ PointIdFrom = "PointIdFrom"
+ // PointIdFromChild - Searches child for field value to use for naming when hitting a slice, (as opposed to using an index).
+ PointIdFromChild = "PointIdFromChild"
+ // PointIdReplace - Replace PointNameFrom instead of append.
+ PointIdReplace = "PointIdReplace"
+ // PointIdFromParent - Searches child for field value to use for naming when hitting a slice, (as opposed to using an index).
+ // PointIdFromParent = "PointIdFromParent" - Not supported.
+
// PointParentId - Associated parent of point.
PointParentId = "PointParentId"
@@ -26,54 +42,46 @@ const (
UpdateFreqYear = "yearly"
UpdateFreqTotal = "total"
+
// PointValueType - Value type of point: energy, date, battery, temperature.
PointValueType = "PointValueType"
-
- // PointIgnore - Ignore this point.
- PointIgnore = "PointIgnore"
-
- // PointIgnoreIfNil - Ignore this point if a child is nil or empty.
- PointIgnoreIfNil = "PointIgnoreIfNil"
-
- // PointIgnoreIfNilFromChild - Ignore this point if a child is nil or empty.
- PointIgnoreIfNilFromChild = "PointIgnoreIfNilFromChild"
-
- // PointAliasTo - Alias this point to another point.
- PointAliasTo = "PointAliasTo"
-
- // PointAliasFrom - Alias this point from another point.
- PointAliasFrom = "PointAliasFrom"
-
// PointUnit - Units: Wh, kWh, C, h.
PointUnit = "PointUnit"
-
// PointUnitFrom - Get PointUnit from another field structure.
PointUnitFrom = "PointUnitFrom"
-
// PointUnitFromParent - Get PointUnit from another parent field structure.
PointUnitFromParent = "PointUnitFromParent"
+
+ // PointIgnore - Ignore this point.
+ PointIgnore = "PointIgnore"
+ // PointIgnoreIfNil - Ignore this point if a child is nil or empty.
+ PointIgnoreIfNil = "PointIgnoreIfNil"
+ // PointIgnoreChildIfFromNil - Ignore this point if a child is nil or empty.
+ PointIgnoreChildIfFromNil = "PointIgnoreChildIfFromNil"
+ // PointIgnoreZero - Ignore arrays with zero size, (default true).
+ PointIgnoreZero = "PointIgnoreZero"
+
+
+ // PointAliasTo - Alias this point to another point.
+ PointAliasTo = "PointAliasTo"
+ // PointAliasFrom - Alias this point from another point.
+ PointAliasFrom = "PointAliasFrom"
+
+
// PointGroupName - Point group name.
PointGroupName = "PointGroupName"
-
// PointGroupNameFrom - Get PointGroupName from another field structure.
PointGroupNameFrom = "PointGroupNameFrom"
+
// PointName - Human-readable name of point.
PointName = "PointName"
- // PointNameFromChild - Searches child for field value to use for naming when hitting a slice, (as opposed to using an index).
- PointNameFromChild = "PointNameFromChild"
-
- // PointNameFromParent - Searches child for field value to use for naming when hitting a slice, (as opposed to using an index).
- PointNameFromParent = "PointNameFromParent"
// PointNameDateFormat - Date format when using PointNameFrom, (if the field is a time.Time type).
PointNameDateFormat = "PointNameDateFormat"
- // PointNameAppend - Append PointNameFrom instead of replace.
- PointNameAppend = "PointNameAppend"
-
// PointArrayFlatten - Flatten an array into a string. EG: ["one", "two", "three"]
PointArrayFlatten = "PointArrayFlatten"
@@ -83,33 +91,40 @@ const (
// PointSplitOnType - What valueTypes will be used for a split.
PointSplitOnType = "PointSplitOnType"
- // PointIgnoreZero - Ignore arrays with zero size, (default true).
- PointIgnoreZero = "PointIgnoreZero"
-
// PointTimestampFrom - Pull timestamp from another field structure.
PointTimestampFrom = "PointTimestampFrom"
+ // PointValueReplace - Search endpoint value and replace with string contained in PointValueReplaceWith
+ PointValueReplace = "PointValueReplace"
+ // PointValueReplaceWith -
+ PointValueReplaceWith = "PointValueReplaceWith"
+
+
+ // PointDevice - Define a PointDevice for this point.
+ PointDevice = "PointDevice"
+ // PointDeviceFrom - Reference PointDevice from another sibling.
+ PointDeviceFrom = "PointDeviceFrom"
+ // PointDeviceFromParent - Reference PointDevice from a parent.
+ PointDeviceFromParent = "PointDeviceFromParent"
+
+
// IsDataTable - This entity is a data table - Will only traverse down one child.
IsDataTable = "DataTable"
-
+ // DataTableChild - Will be included in table listings.
+ DataTableChild = "DataTableChild"
// DataTableId - Table id, (defaults to Json tag).
DataTableId = "DataTableId"
-
// DataTableName - Table Name, (defaults to DataTableId).
DataTableName = "DataTableName"
-
// DataTableTitle - Table Title, (defaults to DataTableId in name format).
DataTableTitle = "DataTableTitle"
-
// DataTableMerge - Merge rows together - useful for when we use, for EG: []valueTypes.Float
DataTableMerge = "DataTableMerge"
-
// DataTableShowIndex - Show index on table.
DataTableShowIndex = "DataTableShowIndex"
-
// DataTableSortOn - Sort table using this Field.
DataTableSortOn = "DataTableSortOn"
-
)
type GoStruct bool
+type GoStructParent bool
diff --git a/iSolarCloud/api/GoStruct/legacy.go b/iSolarCloud/api/GoStruct/legacy.go
new file mode 100644
index 000000000..1bfce75c5
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/legacy.go
@@ -0,0 +1,102 @@
+package GoStruct
+
+
+// func FindStart(fieldName string, Parent *Reflect, Current *Reflect, name EndPointPath) *Reflect {
+// var ret Reflect
+//
+// for range Only.Once {
+// if Current.Kind == reflect.Pointer {
+// // Special case:
+// // We're going to change the pointer to a proper object reference.
+// if Current.IsNil {
+// break
+// }
+// ref2 := Current.ValueOf.Elem().Interface()
+// if valueTypes.IsNil(ref2) {
+// break
+// }
+// Current.Init(Current, ref2, Current.DataStructure.Endpoint)
+// if Current.IsNil {
+// break
+// }
+// // DO NOT BREAK!
+// // KEEP FIRST!
+// }
+//
+// if Current.Kind == reflect.Struct {
+// // Iterate over all available fields and read the tag value
+// for index := 0; index < Current.Length; index++ {
+// var Child Reflect
+// Child.SetByIndex(Parent, Current, index, reflect.Value{})
+//
+// if Child.FieldName == fieldName {
+// ret = Child
+// break
+// }
+//
+// if Child.Kind != reflect.Struct {
+// continue
+// }
+//
+// if Child.IsKnown() {
+// continue
+// }
+//
+// Child = *FindStart(fieldName, Current, &Child, name)
+// }
+// break
+// }
+//
+// if Current.Kind == reflect.Slice {
+// // Iterate over all available fields and read the tag value
+// for index := 0; index < Current.Length; index++ {
+// var Child Reflect
+// Child.SetByIndex(Parent, Current, index, reflect.Value{})
+//
+// if Child.FieldName == fieldName {
+// ret = Child
+// break
+// }
+//
+// if Child.Kind != reflect.Slice {
+// continue
+// }
+//
+// if Child.IsKnown() {
+// continue
+// }
+//
+// Child = *FindStart(fieldName, Current, &Child, name)
+// }
+// break
+// }
+//
+// if Current.Kind == reflect.Map {
+// // Iterate over all available fields and read the tag value
+// for index, key := range Current.FieldVo.MapKeys() {
+// var Child Reflect
+// Child.SetByIndex(Parent, Current, index, key)
+//
+// if Child.FieldName == fieldName {
+// ret = Child
+// break
+// }
+//
+// if Child.Kind != reflect.Map {
+// continue
+// }
+//
+// if Child.IsKnown() {
+// continue
+// }
+//
+// Child = *FindStart(fieldName, Current, &Child, name)
+// }
+// break
+// }
+//
+// _, _ = fmt.Fprintf(os.Stderr,"ERROR: Field '%s' type not supported: Type %s\n", Current.FieldName, Current.Kind.String())
+// }
+//
+// return &ret
+// }
diff --git a/iSolarCloud/api/GoStruct/output/struct_table.go b/iSolarCloud/api/GoStruct/output/struct_table.go
index b1fe7d97b..0e05fcd05 100644
--- a/iSolarCloud/api/GoStruct/output/struct_table.go
+++ b/iSolarCloud/api/GoStruct/output/struct_table.go
@@ -6,6 +6,7 @@ import (
"fmt"
tabular "github.com/agrison/go-tablib"
"os"
+ "strings"
)
// "github.com/agrison/go-tablib"
// "go.pennock.tech/tabular"
@@ -88,6 +89,14 @@ func (t *Table) SetTitle(title string, args ...interface{}) {
t.title = fmt.Sprintf(title, args...)
}
+func (t *Table) GetTitle() string {
+ return t.title
+}
+
+func (t *Table) GetFilePrefix() string {
+ return t.filePrefix
+}
+
func (t *Table) SetRaw(data []byte) {
t.raw = data
}
@@ -149,11 +158,33 @@ func (t *Table) IsNotValid() bool {
}
func (t *Table) SetFilePrefix(prefix string, args ...interface{}) {
- if len(args) == 0 {
- t.filePrefix = prefix
- return
+ for range Only.Once {
+ if prefix == "" {
+ break
+ }
+ if len(args) == 0 {
+ t.filePrefix = prefix
+ t.filePrefix = strings.ReplaceAll(t.filePrefix, "[", "")
+ t.filePrefix = strings.ReplaceAll(t.filePrefix, "]", "")
+ break
+ }
+ t.filePrefix = fmt.Sprintf(prefix, args...)
+ t.filePrefix = strings.ReplaceAll(t.filePrefix, "[", "")
+ t.filePrefix = strings.ReplaceAll(t.filePrefix, "]", "")
+ }
+}
+
+func (t *Table) AppendFilePrefix(prefix string, args ...interface{}) {
+ for range Only.Once {
+ if prefix == "" {
+ break
+ }
+ if len(args) == 0 {
+ t.filePrefix += "-" + prefix
+ break
+ }
+ t.filePrefix += "-" + fmt.Sprintf(prefix, args...)
}
- t.filePrefix = fmt.Sprintf(prefix, args...)
}
func (t *Table) SetOutputType(outputType string) {
@@ -247,7 +278,7 @@ func (t *Table) WriteList() error {
}
if t.saveAsFile {
- t.Error = t.writeFile(t.filePrefix+".txt", t.String(), DefaultFileMode)
+ t.Error = t.writeFile(t.filePrefix + ".txt", t.String(), DefaultFileMode)
break
}
fmt.Printf("# %s\n", t.title)
diff --git a/iSolarCloud/api/GoStruct/reflection/funcs.go b/iSolarCloud/api/GoStruct/reflection/funcs.go
index 168d3aec8..69d3d598a 100644
--- a/iSolarCloud/api/GoStruct/reflection/funcs.go
+++ b/iSolarCloud/api/GoStruct/reflection/funcs.go
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"github.com/MickMake/GoUnify/Only"
+ "os"
"reflect"
"strings"
"time"
@@ -22,28 +23,28 @@ func GetPointNameFrom(ref interface{}, name string, intSize int, dateFormat stri
var ra []string
switch vo.Kind() {
- case reflect.Struct:
- for _, pnf := range strings.Split(name, ".") {
- // Iterate over all available fields, looking for the field name.
- for i := 0; i < vo.NumField(); i++ {
- fn := vo.Type().Field(i).Name
- if fn == pnf {
- ra = append(ra, valueTypes.AnyToValueString(vo.Field(i).Interface(), intSize, dateFormat))
- break
+ case reflect.Struct:
+ for _, pnf := range strings.Split(name, ".") {
+ // Iterate over all available fields, looking for the field name.
+ for i := 0; i < vo.NumField(); i++ {
+ fn := vo.Type().Field(i).Name
+ if fn == pnf {
+ ra = append(ra, valueTypes.AnyToValueString(vo.Field(i).Interface(), intSize, dateFormat))
+ break
+ }
}
}
- }
- case reflect.Map:
- for _, pnf := range strings.Split(name, ".") {
- // Iterate over all available keys, looking for the key name.
- for _, key := range vo.MapKeys() {
- if key.String() == pnf {
- ra = append(ra, valueTypes.AnyToValueString(vo.MapIndex(key).Interface(), intSize, dateFormat))
- break
+ case reflect.Map:
+ for _, pnf := range strings.Split(name, ".") {
+ // Iterate over all available keys, looking for the key name.
+ for _, key := range vo.MapKeys() {
+ if key.String() == pnf {
+ ra = append(ra, valueTypes.AnyToValueString(vo.MapIndex(key).Interface(), intSize, dateFormat))
+ break
+ }
}
}
- }
}
ret = strings.Join(ra, ".")
}
@@ -51,23 +52,186 @@ func GetPointNameFrom(ref interface{}, name string, intSize int, dateFormat stri
return ret
}
-func GetStringFrom(ref interface{}, name string) string {
+// func GetStringFrom(ref interface{}, name string) string {
+// var ret string
+// for range Only.Once {
+// vo := reflect.ValueOf(ref)
+//
+// switch vo.Kind() {
+// case reflect.Struct:
+// // Iterate over all available fields, looking for the field name.
+// for i := 0; i < vo.NumField(); i++ {
+// if vo.Type().Field(i).Name == name {
+// ret = valueTypes.AnyToValueString(vo.Field(i).Interface(), 0, "")
+// break
+// }
+// }
+//
+// case reflect.Array:
+// fallthrough
+// case reflect.Slice:
+// // Iterate over all available entities, looking for the field name under struct or map.
+// for i := 0; i < vo.Len(); i++ {
+// ivo := reflect.ValueOf(vo.Index(i).Interface())
+// foo := ivo.Interface()
+// fmt.Sprintf("%s", foo)
+// foo2 := vo.Index(i).Interface()
+// fmt.Sprintf("%s", foo2)
+// switch ivo.Kind() {
+// case reflect.Struct:
+// // Iterate over all available fields, looking for the field name.
+// for ii := 0; ii < ivo.NumField(); ii++ {
+// if ivo.Type().Field(ii).Name == name {
+// ret = valueTypes.AnyToValueString(ivo.Field(i).Interface(), 0, "")
+// break
+// }
+// }
+// case reflect.Map:
+// // Iterate over map, looking for the key name.
+// for _, key := range ivo.MapKeys() {
+// if key.String() == name {
+// ret = valueTypes.AnyToValueString(ivo.MapIndex(key).Interface(), 0, "")
+// break
+// }
+// }
+// }
+// // ret = GetStringFrom(vo.Index(i).Interface(), name)
+// // if ret != "" {
+// // break
+// // }
+// }
+//
+// case reflect.Map:
+// // Iterate over map, looking for the key name.
+// for _, key := range vo.MapKeys() {
+// if key.String() == name {
+// ret = valueTypes.AnyToValueString(vo.MapIndex(key).Interface(), 0, "")
+// break
+// }
+// }
+// }
+// }
+//
+// return ret
+// }
+
+const AnyIndex = -1
+
+func GetStringFrom(ref interface{}, index int, name string) string {
+ var ret string
+ for range Only.Once {
+ kind := reflect.ValueOf(ref).Kind()
+ if kind == reflect.Struct {
+ ret = GetStringFromStruct(ref, name)
+ break
+ }
+
+ if kind == reflect.Array {
+ ret = GetStringFromArray(ref, index, name)
+ break
+ }
+
+ if kind == reflect.Slice {
+ ret = GetStringFromArray(ref, index, name)
+ break
+ }
+
+ if kind == reflect.Map {
+ ret = GetStringFromMap(ref, name)
+ break
+ }
+ }
+
+ return ret
+}
+
+func GetStringFromArray(ref interface{}, index int, name string) string {
var ret string
for range Only.Once {
vo := reflect.ValueOf(ref)
+ if (vo.Kind() != reflect.Slice) && (vo.Kind() != reflect.Array) {
+ break
+ }
- switch vo.Kind() {
- case reflect.Struct:
- // Iterate over all available fields, looking for the field name.
- for i := 0; i < vo.NumField(); i++ {
- if vo.Type().Field(i).Name == name {
- ret = valueTypes.AnyToValueString(vo.Field(i).Interface(), 0, "")
+ if index == AnyIndex {
+ for i := 0; i < vo.Len(); i++ {
+ v := vo.Index(index).Interface()
+ ivo := reflect.ValueOf(v)
+ switch ivo.Kind() {
+ case reflect.Struct:
+ ret = GetStringFromStruct(v, name)
+ case reflect.Map:
+ ret = GetStringFromMap(v, name)
+ default:
+ // Don't descend anything else.
+ }
+ if ret != "" {
break
}
}
+ break
+ }
- case reflect.Map:
- // Iterate over all available fields, looking for the field name.
+ if index >= vo.Len() {
+ break
+ }
+
+ v := vo.Index(index).Interface()
+ ivo := reflect.ValueOf(v)
+ switch ivo.Kind() {
+ case reflect.Struct:
+ ret = GetStringFromStruct(v, name)
+ case reflect.Map:
+ ret = GetStringFromMap(v, name)
+ default:
+ // Don't descend anything else.
+ }
+ }
+
+ return ret
+}
+
+func GetStringFromStruct(ref interface{}, name string) string {
+ var ret string
+ for range Only.Once {
+ vo := reflect.ValueOf(ref)
+ if vo.Kind() != reflect.Struct {
+ break
+ }
+
+ // Iterate over all available fields, looking for the field name.
+ for i := 0; i < vo.NumField(); i++ {
+ if vo.Type().Field(i).Name == name {
+ ret = valueTypes.AnyToValueString(vo.Field(i).Interface(), 0, "")
+ break
+ }
+ }
+ }
+
+ return ret
+}
+
+func GetStringFromMap(ref interface{}, name string) string {
+ var ret string
+ for range Only.Once {
+ vo := reflect.ValueOf(ref)
+ if vo.Kind() != reflect.Map {
+ break
+ }
+
+ // If the interface has 1 element, then recurse into it - whether map or struct.
+ if len(vo.MapKeys()) == 1 {
+ key := vo.MapKeys()[0]
+ vo = reflect.ValueOf(vo.MapIndex(key).Interface())
+ }
+
+ if vo.Kind() == reflect.Struct {
+ ret = GetStringFromStruct(vo.Interface(), name)
+ break
+ }
+
+ if vo.Kind() == reflect.Map {
+ // Iterate over map, looking for the key name.
for _, key := range vo.MapKeys() {
if key.String() == name {
ret = valueTypes.AnyToValueString(vo.MapIndex(key).Interface(), 0, "")
@@ -80,6 +244,7 @@ func GetStringFrom(ref interface{}, name string) string {
return ret
}
+
func GetJsonTag(fieldTo reflect.StructField) string {
var ret string
@@ -101,25 +266,25 @@ func GetTimestampFrom(ref interface{}, name string, dateFormat string) time.Time
vo := reflect.ValueOf(ref)
switch vo.Kind() {
- case reflect.Struct:
- // Iterate over all available fields, looking for the field name.
- for i := 0; i < vo.NumField(); i++ {
- if vo.Type().Field(i).Name == name {
- v := fmt.Sprintf("%v", vo.Field(i).Interface())
- ret = valueTypes.SetDateTimeString(v).Time
- break
+ case reflect.Struct:
+ // Iterate over all available fields, looking for the field name.
+ for i := 0; i < vo.NumField(); i++ {
+ if vo.Type().Field(i).Name == name {
+ v := fmt.Sprintf("%v", vo.Field(i).Interface())
+ ret = valueTypes.SetDateTimeString(v).Time
+ break
+ }
}
- }
- case reflect.Map:
- // Iterate over all available fields, looking for the field name.
- for _, key := range vo.MapKeys() {
- if key.String() == name {
- v := fmt.Sprintf("%v", vo.MapIndex(key).Interface())
- ret = valueTypes.SetDateTimeString(v).Time
- break
+ case reflect.Map:
+ // Iterate over all available fields, looking for the field name.
+ for _, key := range vo.MapKeys() {
+ if key.String() == name {
+ v := fmt.Sprintf("%v", vo.MapIndex(key).Interface())
+ ret = valueTypes.SetDateTimeString(v).Time
+ break
+ }
}
- }
}
}
@@ -153,6 +318,73 @@ func GetRequestString(ref interface{}) string {
return ret
}
+func IsRefZero(x interface{}) bool {
+ return reflect.DeepEqual(x, reflect.Zero(reflect.TypeOf(x)).Interface())
+}
+
+
+func SetFrom(to interface{}, from interface{}) error {
+ var err error
+ for range Only.Once {
+ break
+ // to has to be a pointer!
+ voSrc := reflect.ValueOf(to)
+ for index := 0; index < reflect.ValueOf(to).NumField(); index++ {
+ FieldVoFrom := voSrc.Field(index)
+ FieldToFrom := voSrc.Type().Field(index)
+
+ if FieldToFrom.IsExported() == false {
+ // err = errors.New(fmt.Sprintf("NOT Exported: FieldToSrc.%s\n", FieldToSrc.Name))
+ continue
+ }
+
+ if FieldVoFrom.IsZero() {
+ // if reflection.IsRefZero(FieldVoSrc.Interface()) {
+ err = errors.New(fmt.Sprintf("Is Zero: FieldToSrc.%s (%v)\n", FieldToFrom.Name, FieldVoFrom.Interface()))
+ continue
+ }
+
+ if !FieldVoFrom.IsValid() {
+ err = errors.New(fmt.Sprintf("Is NOT Valid: FieldToSrc.%s (%v)\n", FieldToFrom.Name, FieldVoFrom.Interface()))
+ continue
+ }
+
+ FieldVoTo := reflect.ValueOf(from).Elem().Field(index)
+ FieldToTo := reflect.TypeOf(from).Elem().Field(index)
+ if !FieldVoTo.CanSet() {
+ err = errors.New(fmt.Sprintf("Cannot set: FieldVoDst.%s (%v)\n", FieldToTo.Name, FieldVoTo.Interface()))
+ continue
+ }
+
+ switch FieldToFrom.Type.String() { // FieldVoSrc.Kind().String()
+ case "bool":
+ FieldVoTo.SetBool(FieldVoFrom.Bool())
+
+ case "string":
+ // if FieldVoSrc.String() == "" {
+ // break
+ // }
+ FieldVoTo.SetString(FieldVoFrom.String())
+
+ case "GoStruct.EndPointPath":
+ // We're not updating this field.
+
+ case "time.Time":
+ // We're not updating this field.
+
+ case "GoStruct.tagStrings":
+ // We're not updating this field.
+
+ default:
+ _, _ = fmt.Fprintf(os.Stderr,"SetFrom() Unknown type %s (%s) for field '%s' from '%v' to '%v'\n",
+ FieldToFrom.Type, FieldVoFrom.Kind().String(), FieldToFrom.Name, FieldVoTo.Interface(), FieldVoFrom.Interface())
+ }
+ }
+ }
+
+ return err
+}
+
// GetArea Return an Area name if we are given an Area or EndPoint struct.
func GetArea(trim string, v interface{}) string {
@@ -190,6 +422,8 @@ func GetName(trim string, v interface{}) string {
for range Only.Once {
val := reflect.ValueOf(v)
ret1 := val.Type().PkgPath()
+ sp := strings.Split(ret1, "/")
+ ret1 = sp[len(sp)-1]
ret1 = strings.TrimPrefix(ret1, trim)
ret2 := val.Type().Name()
diff --git a/iSolarCloud/api/GoStruct/struct_data.go b/iSolarCloud/api/GoStruct/struct_data.go
index fc5789aca..584a855be 100644
--- a/iSolarCloud/api/GoStruct/struct_data.go
+++ b/iSolarCloud/api/GoStruct/struct_data.go
@@ -1,654 +1 @@
package GoStruct
-
-import (
- "GoSungrow/iSolarCloud/api/GoStruct/reflection"
- "GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "fmt"
- "github.com/MickMake/GoUnify/Only"
- "os"
- "reflect"
- "strings"
- "time"
-)
-
-
-type DataStructure struct {
- Required bool
- Json string
- PointId string
- PointParentId string
- PointUpdateFreq string
- PointValueType string
- PointAliasTo string
-
- PointTimestamp time.Time
- PointTimestampFrom string
-
- PointUnit string
- PointUnitFrom string
- PointUnitFromParent string
-
- PointName string
- PointNameAppend bool
- PointNameFromChild string
- PointNameFromParent string
- PointNameDateFormat string
-
- PointIgnore bool
- PointIgnoreZero bool
- PointIgnoreIfNil string
- PointIgnoreIfNilFromChild string
-
- PointGroupName string
- PointGroupNameFrom string
-
- PointArrayFlatten bool
- PointSplitOn string
- PointSplitOnType string
-
- DataTable bool
- DataTableId string
- DataTableName string
- DataTableTitle string
- DataTableMerge bool
- DataTableShowIndex bool
- DataTableSortOn string
-
- Value interface{}
- ValueType string
- ValueKind string
- Endpoint EndPointPath
-}
-
-func (ds *DataStructure) Set(parent interface{}, current interface{}, fieldTo reflect.StructField, fieldVo reflect.Value) DataStructure {
- for range Only.Once {
- ignore := false
- if fieldTo.Tag.Get(PointIgnore) != "" {
- ignore = true
- }
-
- pointIgnoreIfNil := fieldTo.Tag.Get(PointIgnoreIfNil)
- if pointIgnoreIfNil != "" {
- ret := reflection.GetStringFrom(current, pointIgnoreIfNil)
- if (ret == "") || (ret == "--") {
- ignore = true
- }
- }
-
- // pointIgnoreIfNilFromChild := fieldTo.Tag.Get(PointIgnoreIfNilFromChild)
- // if pointIgnoreIfNilFromChild != "" {
- // ret := GetStringFrom(fieldVo.Interface(), pointIgnoreIfNilFromChild)
- // if (ret == "") || (ret == "--") {
- // ignore = true
- // }
- // }
-
- var pointIgnoreZero bool
- switch fieldTo.Tag.Get(PointIgnoreZero) {
- case "false":
- pointIgnoreZero = false
- case "true":
- pointIgnoreZero = true
- default:
- pointIgnoreZero = true
- }
-
- // if valueTypes.IsNil(ref) {
- // pointValueType = "NIL"
- // }
-
- pointJson := reflection.GetJsonTag(fieldTo)
- pointId := fieldTo.Tag.Get(PointId)
- if pointId == "" {
- pointId = pointJson
- }
-
- pointUnit := fieldTo.Tag.Get(PointUnit)
- pointUnitFrom := fieldTo.Tag.Get(PointUnitFrom)
- pointUnitFromParent := fieldTo.Tag.Get(PointUnitFromParent)
- if pointUnitFrom != "" {
- pointUnit = reflection.GetStringFrom(current, pointUnitFrom)
- }
- if pointUnitFromParent != "" {
- pointUnit = reflection.GetStringFrom(parent, pointUnitFromParent)
- }
-
- pointGroupName := fieldTo.Tag.Get(PointGroupName)
- pointGroupNameFrom := fieldTo.Tag.Get(PointGroupNameFrom)
- if pointGroupNameFrom != "" {
- pointGroupName = reflection.GetStringFrom(current, pointGroupNameFrom)
- }
-
- pointTimestamp := time.Now()
- pointTimestampFrom := fieldTo.Tag.Get(PointTimestampFrom)
- if pointTimestampFrom != "" {
- pointTimestamp = reflection.GetTimestampFrom(current, pointTimestampFrom, valueTypes.DateTimeLayout)
- }
-
- var valueType string
- if fieldTo.Type != nil {
- valueType = fieldTo.Type.String()
- }
-
- pointName := fieldTo.Tag.Get(PointName)
- if pointName == "" {
- pointName = valueTypes.PointToName(pointId)
- }
-
- pointNameDateFormat := fieldTo.Tag.Get(PointNameDateFormat)
- if pointNameDateFormat == "" {
- pointNameDateFormat = valueTypes.DateTimeLayout
- }
-
- pointUpdateFreq := fieldTo.Tag.Get(PointUpdateFreq)
- switch pointUpdateFreq {
- case "UpdateFreqInstant":
- pointUpdateFreq = UpdateFreqInstant
- case "UpdateFreq5Mins":
- pointUpdateFreq = UpdateFreq5Mins
- case "UpdateFreqBoot":
- pointUpdateFreq = UpdateFreqBoot
- case "UpdateFreqDay":
- pointUpdateFreq = UpdateFreqDay
- case "UpdateFreqMonth":
- pointUpdateFreq = UpdateFreqMonth
- case "UpdateFreqYear":
- pointUpdateFreq = UpdateFreqYear
- case "UpdateFreqTotal":
- pointUpdateFreq = UpdateFreqTotal
- }
-
- required := false
- if fieldTo.Tag.Get("required") == "true" {
- required = true
- }
-
- pointNameAppend := true // Defaults to true
- if fieldTo.Tag.Get(PointNameAppend) == "false" {
- pointNameAppend = false
- }
-
- pointArrayFlatten := false
- if fieldTo.Tag.Get(PointArrayFlatten) == "true" {
- pointArrayFlatten = true
- }
-
- dataTable := false
- if fieldTo.Tag.Get(IsDataTable) == "true" {
- dataTable = true
- }
-
- dataTableMerge := false
- if fieldTo.Tag.Get(DataTableMerge) == "true" {
- dataTableMerge = true
- }
-
- dataTableShowIndex := false
- if fieldTo.Tag.Get(DataTableShowIndex) == "true" {
- dataTableShowIndex = true
- }
-
- *ds = DataStructure {
- Required: required,
- Json: pointJson,
- PointId: pointId,
- PointParentId: fieldTo.Tag.Get(PointParentId),
-
- PointUnit: pointUnit,
- PointUnitFrom: pointUnitFrom,
- PointUnitFromParent: pointUnitFromParent,
-
- PointTimestamp: pointTimestamp,
- PointTimestampFrom: pointTimestampFrom,
-
- PointGroupName: pointGroupName,
- PointGroupNameFrom: pointGroupNameFrom,
-
- PointName: pointName,
- PointNameAppend: pointNameAppend,
- PointNameFromChild: fieldTo.Tag.Get(PointNameFromChild),
- PointNameFromParent: fieldTo.Tag.Get(PointNameFromParent),
- PointNameDateFormat: pointNameDateFormat,
-
- PointUpdateFreq: pointUpdateFreq,
- PointValueType: fieldTo.Tag.Get(PointValueType),
- PointAliasTo: fieldTo.Tag.Get(PointAliasTo),
- PointIgnore: ignore,
- PointIgnoreIfNil: pointIgnoreIfNil,
- PointIgnoreIfNilFromChild: fieldTo.Tag.Get(PointIgnoreIfNilFromChild),
- PointArrayFlatten: pointArrayFlatten,
- PointSplitOn: fieldTo.Tag.Get(PointSplitOn),
- PointSplitOnType: fieldTo.Tag.Get(PointSplitOnType),
- PointIgnoreZero: pointIgnoreZero,
-
- DataTable: dataTable,
- DataTableId: fieldTo.Tag.Get(DataTableId),
- DataTableName: fieldTo.Tag.Get(DataTableName),
- DataTableTitle: fieldTo.Tag.Get(DataTableTitle),
- DataTableMerge: dataTableMerge,
- DataTableShowIndex: dataTableShowIndex,
- DataTableSortOn: fieldTo.Tag.Get(DataTableSortOn),
-
- Value: fieldVo.Interface(),
- ValueType: valueType,
- ValueKind: fieldVo.Kind().String(),
- Endpoint: EndPointPath{},
- }
- }
- return *ds
-}
-
-type DataStructures struct {
- DataMap map[string]DataStructure
- DataTables DataTables
- ShowEmpty bool
- Debug bool
-}
-
-func (dss *DataStructures) GetPointTags(Parent *Reflect, Current *Reflect, name EndPointPath) DataStructures {
-
- for range Only.Once {
- if Current.DataStructure.DataTable {
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"GetPointTags() Adding DataTable - Current: %s\n", Current)
- }
- dss.AddTable(Current)
- }
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"GetPointTags() Current: %s\n", Current)
- }
-
- dss.PointNameAppend(Current)
-
- if dss.PointIgnoreZero(Parent, Current) {
- break
- }
-
- if dss.PointIgnoreIfNilFromChild(Parent, Current) {
- break
- }
-
- if !Current.IsExported {
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"GetPointTags(%s) Current: %s is NOT exported - Name:%s\n", Current.FieldName, Current, name)
- }
- break
- }
-
- if Current.Kind == reflect.Pointer {
- // Special case:
- // We're going to change the pointer to a proper object reference.
- if Current.IsNil {
- break
- }
- ref2 := Current.ValueOf.Elem().Interface()
- if valueTypes.IsNil(ref2) {
- break
- }
- Current.SetByFieldName(Current.Interface, ref2, "")
- if Current.IsNil {
- break
- }
- // DO NOT BREAK!
- // KEEP FIRST!
- }
-
- switch Current.Kind {
- case reflect.Slice:
- fallthrough
- case reflect.Array:
- dss.ProcessSlice(Parent, Current, name)
-
- case reflect.Map:
- dss.ProcessMap(Parent, Current, name)
-
- case reflect.Struct:
- dss.ProcessStruct(Parent, Current, name)
-
- case reflect.Invalid:
- dss.ProcessUnsupported(Parent, Current, name)
-
- case reflect.Interface:
- dss.ProcessUnsupported(Parent, Current, name)
-
- default:
- _, _ = fmt.Fprintf(os.Stderr,"GetPointTags(%s) Current: %s type is NOT supported - Name:%s Kind:%s\n", Current.FieldName, Current, name, Current.Kind.String())
-
- // case reflect.Uintptr:
- // case reflect.Complex64:
- // case reflect.Complex128:
- // case reflect.Chan:
- // case reflect.Func:
- // case reflect.UnsafePointer:
- }
- }
-
- return *dss
-}
-
-func (dss *DataStructures) Add(ds DataStructure) {
- for range Only.Once {
- if dss.DataMap == nil {
- dss.DataMap = make(map[string]DataStructure)
- }
- dss.DataMap[ds.Endpoint.String()] = ds
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr, "DEBUG DataStructures.Add() %s - Kind:'%s' Type:'%s'\n", ds.Endpoint.String(), ds.ValueKind, ds.ValueType)
- }
- }
-}
-
-func (dss *DataStructures) Exists(name string) bool {
- var yes bool
- for range Only.Once {
- if dss.DataMap == nil {
- break
- }
- if _, ok := dss.DataMap[name]; ok {
- yes = ok
- break
- }
- }
- return yes
-}
-
-func (dss *DataStructures) Append(dsm DataStructures) {
- for range Only.Once {
- if dss.DataMap == nil {
- dss.DataMap = make(map[string]DataStructure)
- }
- for name, ds := range dsm.DataMap {
- dss.DataMap[name] = ds
- }
- }
-}
-
-func (dss *DataStructures) ProcessUnsupported(_ *Reflect, Current *Reflect, name EndPointPath) {
- for range Only.Once {
- if dss.ShowEmpty {
- dss.Add(Current.DataStructure)
- break
- }
- _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field '%s' type not supported (%s): Type %s\n", Current.FieldName, name, Current.Kind.String())
- }
-}
-
-func (dss *DataStructures) ProcessSlice(Parent *Reflect, Current *Reflect, name EndPointPath) {
- for range Only.Once {
- // Handle slices here.
- if dss.ShowEmpty {
- if Current.Length == 0 {
- Current.DataStructure.PointArrayFlatten = true
- }
- }
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- for si := 0; si < Current.Length; si++ {
- var Child Reflect
- Child.SetByIndex(*Parent, *Current, si, reflect.Value{})
- // Child.DataStructure.Endpoint = name.Copy()
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"SetByIndex() Child: %s\n", Child)
- }
- name2 := Child.DataStructure.Endpoint.Copy()
- if Current.DataStructure.PointNameFromChild != "" {
- name2 = Current.PointNameFromChild(&Child)
- }
-
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- if Child.IsUnknown() {
- dss.GetPointTags(Current, &Child, name2)
- continue
- }
-
- if dss.PointSplitOn(Current, &Child) {
- continue
- }
-
- dss.Add(Child.DataStructure)
- }
- }
-}
-
-func (dss *DataStructures) ProcessStruct(Parent *Reflect, Current *Reflect, name EndPointPath) {
- for range Only.Once {
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- // Iterate over all available fields and read the tag value
- for si := 0; si < Current.Length; si++ {
- var Child Reflect
- Child.SetByIndex(*Parent, *Current, si, reflect.Value{})
- // Child.DataStructure.Endpoint = Current.DataStructure.Endpoint.Append(Child.DataStructure.PointId)
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"SetByIndex() Child: %s\n", Child)
- }
- name2 := Child.DataStructure.Endpoint.Copy()
- if Current.DataStructure.PointNameFromChild != "" {
- name2 = Current.PointNameFromChild(&Child)
- }
-
- if !Child.IsExported {
- _, _ = fmt.Fprintf(os.Stderr, "WARNING: Field '%s' type not exported (%s): Type %s\n", Child.FieldName, name2, Child.Kind.String())
- continue
- }
-
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- if dss.GoStructOptions(Parent, Current, &Child) {
- continue
- }
-
- if Child.IsUnknown() {
- dss.GetPointTags(Current, &Child, name2)
- continue
- }
-
- if dss.PointSplitOn(Current, &Child) {
- continue
- }
-
- // COMPARE(Child.DataStructure.Endpoint, Child.DataStructure.Value, Child.Interface)
- dss.Add(Child.DataStructure)
- }
- }
-}
-
-func (dss *DataStructures) ProcessMap(Parent *Reflect, Current *Reflect, name EndPointPath) {
- for range Only.Once {
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- for si, sm := range Current.FieldVo.MapKeys() {
- // @TODO - Implement pointNameFromChild / pointNameFromParent.
- // @TODO - Need to look at other types, besides known types.
- var Child Reflect
- Child.SetByIndex(*Parent, *Current, si, sm)
- // Child.DataStructure.Endpoint = name.Copy()
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"SetByIndex() Child: %s\n", Child)
- }
- name2 := Child.DataStructure.Endpoint.Copy()
- if Current.DataStructure.PointNameFromChild != "" {
- name2 = Current.PointNameFromChild(&Child)
- }
-
- if dss.PointArrayFlatten(Parent, Current, name) {
- break
- }
-
- if Child.IsUnknown() {
- dss.GetPointTags(Current, &Child, name2)
- continue
- }
-
- if dss.PointSplitOn(Current, &Child) {
- continue
- }
-
- // COMPARE(Child.DataStructure.Endpoint, Child.DataStructure.Value, Child.Interface)
- dss.Add(Child.DataStructure)
- }
- }
-}
-
-func (dss *DataStructures) PointNameAppend(Current *Reflect) EndPointPath {
- for range Only.Once {
- if Current.DataStructure.PointNameAppend == false {
- if Current.DataStructure.Endpoint.IsZero() {
- break
- }
- Current.DataStructure.Endpoint.PopLast()
- }
- }
- return Current.DataStructure.Endpoint
-}
-
-func (dss *DataStructures) PointArrayFlatten(Parent *Reflect, Current *Reflect, name EndPointPath) bool {
- var yes bool
- for range Only.Once {
- if Parent.DataStructure.DataTable {
- // Flatten a child if the parent is a table.
- Current.DataStructure.PointArrayFlatten = true
- if Current.DataStructure.PointUnit == "" {
- Current.DataStructure.PointUnit = "--"
- }
- if Current.DataStructure.PointValueType == "" {
- Current.DataStructure.PointValueType = "Table"
- }
- if Current.DataStructure.ValueType == "" {
- Current.DataStructure.ValueType = "Table"
- }
- // @TODO - Consider standardizing points to a known format.
- // queryUserCurveTemplateData is a good example of the structure.
- }
-
- if Current.DataStructure.PointArrayFlatten {
- // We want to flatten a slice down to EG "[1, 2, 3]"
- Current.DataStructure.Value = valueTypes.AnyToValueString(Current.FieldVo.Interface(), 0, "")
- Current.DataStructure.Endpoint = name.Copy()
- dss.Add(Current.DataStructure)
- yes = true
- }
- }
- return yes
-}
-
-func (dss *DataStructures) PointIgnoreZero(_ *Reflect, Current *Reflect) bool {
- var yes bool
- for range Only.Once {
- if !Current.DataStructure.PointIgnoreZero {
- yes = false
- break
- }
- if dss.ShowEmpty {
- yes = false
- break
- }
- if Current.Length == 0 {
- yes = true
- }
- yes = false
- }
- return yes
-}
-
-func (dss *DataStructures) PointIgnoreIfNilFromChild(Parent *Reflect, Current *Reflect) bool {
- var yes bool
- for range Only.Once {
- if Parent.DataStructure.PointIgnoreIfNilFromChild == "" {
- yes = false
- break
- }
- if dss.ShowEmpty {
- yes = false
- break
- }
- ret := reflection.GetStringFrom(Current.Interface, Parent.DataStructure.PointIgnoreIfNilFromChild)
- if ret == "" {
- yes = false
- break
- }
- yes = true
- }
- return yes
-}
-
-func (dss *DataStructures) PointSplitOn(_ *Reflect, Current *Reflect) bool {
- var yes bool
- for range Only.Once {
- if Current.DataStructure.PointSplitOn == "" {
- break
- }
- // We want to split a string into separate points - currently only handles string types.
- // @TODO - Fix this up! - Use PointSplitType to define a particular type.
- soVal := valueTypes.AnyToValueString(Current.FieldVo.Interface(), 0, "")
- soEP := Current.DataStructure.Endpoint.Copy()
- soSplit := strings.Split(soVal, Current.DataStructure.PointSplitOn)
- for soI, soV := range soSplit {
- Current.DataStructure.Value = strings.ReplaceAll(soV, "&", ".p")
- Current.DataStructure.Endpoint = soEP.Copy()
- Current.DataStructure.Endpoint.Append(valueTypes.PrintInt(2, soI))
- dss.Add(Current.DataStructure)
- }
- yes = true
- }
- return yes
-}
-
-func (dss *DataStructures) GoStructOptions(Parent *Reflect, Current *Reflect, Child *Reflect) bool {
- var yes bool
- for range Only.Once {
- if Child.FieldName != NameGoStruct {
- break
- }
-
- // @TODO - Need to check here if the parent is a slice.
- // If so - then "parent" is actually Parent.
- // If not - then "parent" is actually Current.
-
- if Child.DataStructure.DataTable {
- Parent.DataStructure.DataTable = Child.DataStructure.DataTable
- }
- if Child.DataStructure.DataTableMerge {
- Parent.DataStructure.DataTableMerge = Child.DataStructure.DataTableMerge
- }
- if Child.DataStructure.DataTableShowIndex {
- Parent.DataStructure.DataTableShowIndex = Child.DataStructure.DataTableShowIndex
- }
- if Child.DataStructure.DataTableId != "" {
- Parent.DataStructure.DataTableId = Child.DataStructure.DataTableId
- }
- if Child.DataStructure.DataTableName != "" {
- Parent.DataStructure.DataTableName = Child.DataStructure.DataTableName
- }
- if Child.DataStructure.DataTableTitle != "" {
- Parent.DataStructure.DataTableTitle = Child.DataStructure.DataTableTitle
- }
- if Child.DataStructure.DataTableSortOn != "" {
- Parent.DataStructure.DataTableSortOn = Child.DataStructure.DataTableSortOn
- }
-
- dss.AddTable(Parent)
- yes = true
- }
- return yes
-}
-
-
-func COMPARE(name EndPointPath, ref1 interface{}, ref2 interface{}) {
- t1 := fmt.Sprintf("%v", ref1)
- t2 := fmt.Sprintf("%v", ref2)
- if t1 != t2 {
- fmt.Printf("[%s] VALUE ERROR: '%s' != '%s'\n", name, t1, t2)
- }
-}
diff --git a/iSolarCloud/api/GoStruct/struct_epp.go b/iSolarCloud/api/GoStruct/struct_epp.go
index b30be3180..351a0f40d 100644
--- a/iSolarCloud/api/GoStruct/struct_epp.go
+++ b/iSolarCloud/api/GoStruct/struct_epp.go
@@ -1,6 +1,9 @@
package GoStruct
-import "strings"
+import (
+ "github.com/MickMake/GoUnify/Only"
+ "strings"
+)
type EndPointPath struct {
@@ -17,6 +20,25 @@ func (e EndPointPath) String() string {
return strings.Join(e.path, ".")
}
+// MarshalJSON - Convert value to JSON
+func (e EndPointPath) MarshalJSON() ([]byte, error) {
+ var data []byte
+ var err error
+ for range Only.Once {
+ // data, err = json.Marshal(e.path)
+ // if err!= nil {
+ // break
+ // }
+ data = []byte(`"` + e.String() +`"`)
+ }
+
+ return data, err
+}
+
+func (e *EndPointPath) Clear() {
+ e.path = []string{}
+}
+
func (e *EndPointPath) Strings() []string {
return e.path
}
@@ -28,6 +50,21 @@ func (e *EndPointPath) Index(index int) string {
return e.path[index]
}
+func (e *EndPointPath) First() string {
+ if len(e.path) == 0 {
+ return ""
+ }
+ return e.path[0]
+}
+
+func (e *EndPointPath) Last() string {
+ l := len(e.path)
+ if l == 0 {
+ return ""
+ }
+ return e.path[l-1]
+}
+
func (e *EndPointPath) IsZero() bool {
if len(e.path) == 0 {
return true
diff --git a/iSolarCloud/api/GoStruct/struct_reflect.go b/iSolarCloud/api/GoStruct/struct_reflect.go
index 67d84d796..a859950cb 100644
--- a/iSolarCloud/api/GoStruct/struct_reflect.go
+++ b/iSolarCloud/api/GoStruct/struct_reflect.go
@@ -4,30 +4,422 @@ import (
"GoSungrow/Only"
"GoSungrow/iSolarCloud/api/GoStruct/reflection"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
+ "encoding/json"
"errors"
"fmt"
"os"
"reflect"
+ "strconv"
"strings"
+ "time"
)
+type DataTags struct {
+ Endpoint EndPointPath `json:"endpoint,omitempty"`
+
+ Required bool `json:"required"`
+
+ Json string `json:"json,omitempty"`
+
+ PointDevice string `json:"point_device,omitempty"`
+ PointDeviceFrom string `json:"point_device_from,omitempty"`
+ PointDeviceFromParent string `json:"point_device_from_parent,omitempty"`
+ PointId string `json:"point_id,omitempty"`
+
+ PointUpdateFreq string `json:"point_update_freq,omitempty"`
+ PointValueType string `json:"point_value_type,omitempty"`
+
+ PointAliasTo string `json:"point_alias_to,omitempty"`
+
+ PointTimestamp time.Time `json:"point_timestamp,omitempty"`
+ PointTimestampFrom string `json:"point_timestamp_from,omitempty"`
+
+ PointUnit string `json:"point_unit,omitempty"`
+ PointUnitFrom string `json:"point_unit_from,omitempty"`
+ PointUnitFromParent string `json:"point_unit_from_parent,omitempty"`
+
+ PointName string `json:"point_name,omitempty"`
+ PointIdReplace bool `json:"point_name_append,omitempty"`
+ PointIdFrom string `json:"point_id_from,omitempty"`
+ PointIdFromChild string `json:"point_name_from_child,omitempty"`
+ // PointIdFromParent string `json:"point_name_from_parent,omitempty"`
+ PointNameDateFormat string `json:"point_name_date_format,omitempty"`
+
+ PointIgnore bool `json:"point_ignore,omitempty"`
+ PointIgnoreZero bool `json:"point_ignore_zero,omitempty"`
+ PointIgnoreIfNil string `json:"point_ignore_if_nil,omitempty"`
+ PointIgnoreChildIfFromNil string `json:"point_ignore_if_child_nil,omitempty"`
+
+ PointGroupName string `json:"point_group_name,omitempty"`
+ PointGroupNameFrom string `json:"point_group_name_from,omitempty"`
+ PointArrayFlatten bool `json:"point_array_flatten,omitempty"`
+
+ PointSplitOn string `json:"point_split_on,omitempty"`
+ PointSplitOnType string `json:"point_split_on_type,omitempty"`
+
+ PointValueReplace string `json:"point_value_replace,omitempty"`
+ PointValueReplaceWith string `json:"point_value_replace_with,omitempty"`
+
+ DataTable bool `json:"data_table,omitempty"`
+ DataTableChild bool `json:"data_table_child,omitempty"`
+ DataTableId string `json:"data_table_id,omitempty"`
+ DataTableName string `json:"data_table_name,omitempty"`
+ DataTableTitle string `json:"data_table_title,omitempty"`
+ DataTableMerge bool `json:"data_table_merge,omitempty"`
+ DataTableShowIndex bool `json:"data_table_show_index,omitempty"`
+ DataTableSortOn string `json:"data_table_sort_on,omitempty"`
+ ValueType string `json:"value_type,omitempty"`
+ ValueKind string `json:"value_kind,omitempty"`
+ // MqttFlatten bool
+
+ StrBool tagStrings `json:"-"`
+}
+type tagStrings struct {
+ Required string `json:"-"`
+ PointIdReplace string `json:"-"`
+ PointIgnore string `json:"-"`
+ PointIgnoreZero string `json:"-"`
+ PointArrayFlatten string `json:"-"`
+ DataTable string `json:"-"`
+ DataTableChild string `json:"-"`
+ DataTableMerge string `json:"-"`
+ DataTableShowIndex string `json:"-"`
+}
+
+func (ds DataTags) String() string {
+ var ret string
+ for range Only.Once {
+ j, err := json.Marshal(ds)
+ if err != nil {
+ break
+ }
+ ret = string(j)
+ }
+ return ret
+}
+
+// GetTags -
+func (ds *DataTags) GetTags(parent *Reflect, current *Reflect, fieldTo reflect.StructField, fieldVo reflect.Value) *DataTags {
+ var ret *DataTags
+ for range Only.Once {
+ var valueType string
+ if fieldTo.Type != nil {
+ valueType = fieldTo.Type.String()
+ }
+
+ *ds = DataTags {
+ Endpoint: EndPointPath{},
+
+ Json: reflection.GetJsonTag(fieldTo),
+
+ PointDevice: fieldTo.Tag.Get(PointDevice),
+ PointDeviceFrom: fieldTo.Tag.Get(PointDeviceFrom),
+ PointDeviceFromParent: fieldTo.Tag.Get(PointDeviceFromParent),
+
+ PointId: fieldTo.Tag.Get(PointId),
+
+ PointTimestampFrom: fieldTo.Tag.Get(PointTimestampFrom),
+
+ PointGroupName: fieldTo.Tag.Get(PointGroupName),
+ PointGroupNameFrom: fieldTo.Tag.Get(PointGroupNameFrom),
+
+ PointName: fieldTo.Tag.Get(PointName),
+ PointIdFrom: fieldTo.Tag.Get(PointIdFrom),
+ PointIdFromChild: fieldTo.Tag.Get(PointIdFromChild),
+ // PointIdFromParent: fieldTo.Tag.Get(PointIdFromParent),
+ PointNameDateFormat: fieldTo.Tag.Get(PointNameDateFormat),
+
+ PointUpdateFreq: fieldTo.Tag.Get(PointUpdateFreq),
+
+ PointValueType: fieldTo.Tag.Get(PointValueType),
+ PointValueReplace: fieldTo.Tag.Get(PointValueReplace),
+ PointValueReplaceWith: fieldTo.Tag.Get(PointValueReplaceWith),
+ ValueType: valueType,
+ ValueKind: fieldVo.Kind().String(),
+
+ PointUnit: fieldTo.Tag.Get(PointUnit),
+ PointUnitFrom: fieldTo.Tag.Get(PointUnitFrom),
+ PointUnitFromParent: fieldTo.Tag.Get(PointUnitFromParent),
+
+ PointAliasTo: fieldTo.Tag.Get(PointAliasTo),
+
+ PointIgnoreIfNil: fieldTo.Tag.Get(PointIgnoreIfNil),
+ PointIgnoreChildIfFromNil: fieldTo.Tag.Get(PointIgnoreChildIfFromNil),
+
+ PointSplitOn: fieldTo.Tag.Get(PointSplitOn),
+ PointSplitOnType: fieldTo.Tag.Get(PointSplitOnType),
+
+ DataTableId: fieldTo.Tag.Get(DataTableId),
+ DataTableName: fieldTo.Tag.Get(DataTableName),
+ DataTableTitle: fieldTo.Tag.Get(DataTableTitle),
+ DataTableSortOn: fieldTo.Tag.Get(DataTableSortOn),
+
+ StrBool: tagStrings{
+ Required: fieldTo.Tag.Get("required"),
+ PointIdReplace: fieldTo.Tag.Get(PointIdReplace),
+ PointIgnore: fieldTo.Tag.Get(PointIgnore),
+ PointIgnoreZero: fieldTo.Tag.Get(PointIgnoreZero),
+ PointArrayFlatten: fieldTo.Tag.Get(PointArrayFlatten),
+ DataTable: fieldTo.Tag.Get(IsDataTable),
+ DataTableChild: fieldTo.Tag.Get(DataTableChild),
+ DataTableMerge: fieldTo.Tag.Get(DataTableMerge),
+ DataTableShowIndex: fieldTo.Tag.Get(DataTableShowIndex),
+ },
+ }
+ ret = ds
+ }
+ return ret
+}
+
+func (ds *DataTags) UpdateTags(parent *Reflect, current *Reflect) *DataTags {
+ for range Only.Once {
+ ds.PointIgnore = false
+ if ds.StrBool.PointIgnore != "" {
+ ds.PointIgnore = true
+ }
+
+ if ds.PointIgnoreIfNil != "" {
+ ret := reflection.GetStringFrom(current.Interface, current.Index, ds.PointIgnoreIfNil)
+ if (ret == "") || (ret == "--") {
+ ds.PointIgnore = true
+ }
+ }
+
+ switch ds.StrBool.PointIgnoreZero {
+ case "false":
+ ds.PointIgnoreZero = false
+ case "true":
+ ds.PointIgnoreZero = true
+ default:
+ ds.PointIgnoreZero = true
+ }
+
+ ds.Required = false
+ if ds.StrBool.Required == "true" {
+ ds.Required = true
+ }
+
+ ds.PointIdReplace = false
+ if ds.StrBool.PointIdReplace == "true" {
+ ds.PointIdReplace = true
+ }
+
+ ds.PointArrayFlatten = false
+ if ds.StrBool.PointArrayFlatten == "true" {
+ ds.PointArrayFlatten = true
+ }
+
+ ds.DataTable = false
+ if ds.StrBool.DataTable == "true" {
+ ds.DataTable = true
+ }
+
+ ds.DataTableChild = false
+ if ds.StrBool.DataTableChild == "true" {
+ ds.DataTableChild = true
+ }
+
+ ds.DataTableMerge = false
+ if ds.StrBool.DataTableMerge == "true" {
+ ds.DataTableMerge = true
+ }
+
+ ds.DataTableShowIndex = false
+ if ds.StrBool.DataTableShowIndex == "true" {
+ ds.DataTableShowIndex = true
+ }
+
+ if ds.PointId == "" {
+ ds.PointId = ds.Json
+ }
+
+ if ds.PointUnitFrom != "" {
+ ds.PointUnit = reflection.GetStringFrom(current.Interface, current.Index, ds.PointUnitFrom)
+ }
+ if ds.PointUnitFromParent != "" {
+ ds.PointUnit = reflection.GetStringFrom(current.ParentReflect.Interface, current.ParentReflect.Index, ds.PointUnitFromParent)
+ }
+
+ if ds.PointGroupNameFrom != "" {
+ ds.PointGroupName = reflection.GetStringFrom(current.Interface, current.Index, ds.PointGroupNameFrom)
+ }
+
+ ds.PointTimestamp = time.Now()
+ if ds.PointTimestampFrom != "" {
+ ds.PointTimestamp = reflection.GetTimestampFrom(current.Interface, ds.PointTimestampFrom, valueTypes.DateTimeLayout)
+ }
+
+ if ds.PointDeviceFrom != "" {
+ ds.PointDevice = reflection.GetStringFrom(current.Interface, current.Index, ds.PointDeviceFrom)
+ }
+ if ds.PointDeviceFromParent != "" {
+ ds.PointDevice = reflection.GetStringFrom(current.ParentReflect.Interface, current.ParentReflect.Index, ds.PointDeviceFromParent)
+ }
+
+ if ds.PointName == "" {
+ ds.PointName = valueTypes.PointToName(ds.PointId)
+ }
+
+ if parent.DataStructure.PointIgnoreChildIfFromNil != "" {
+ // Ignore a child if it has a zero/empty value.
+ ret := reflection.GetStringFrom(current.Interface, current.Index, parent.DataStructure.PointIgnoreChildIfFromNil)
+ if ret != "" {
+ ds.PointIgnore = true
+ }
+ }
+
+ if ds.PointNameDateFormat == "" {
+ ds.PointNameDateFormat = valueTypes.DateTimeLayout
+ }
+
+ switch ds.PointUpdateFreq {
+ case "UpdateFreqInstant":
+ ds.PointUpdateFreq = UpdateFreqInstant
+ case "UpdateFreq5Mins":
+ ds.PointUpdateFreq = UpdateFreq5Mins
+ case "UpdateFreqBoot":
+ ds.PointUpdateFreq = UpdateFreqBoot
+ case "UpdateFreqDay":
+ ds.PointUpdateFreq = UpdateFreqDay
+ case "UpdateFreqMonth":
+ ds.PointUpdateFreq = UpdateFreqMonth
+ case "UpdateFreqYear":
+ ds.PointUpdateFreq = UpdateFreqYear
+ case "UpdateFreqTotal":
+ ds.PointUpdateFreq = UpdateFreqTotal
+ }
+ }
+ return ds
+}
+
+// SetFrom - Copy DataTags structure from src to dst with zero/nil checking.
+func (ds *DataTags) SetFrom(from *DataTags) error {
+ var err error
+ for range Only.Once {
+ // Don't overwrite important flags.
+ from.Json = ""
+ from.PointId = ""
+ from.PointName = ""
+ from.ValueType = ""
+ from.ValueKind = ""
+ from.Endpoint.Clear()
+
+ voFrom := reflect.ValueOf(*from)
+ for index := 0; index < reflect.ValueOf(*from).NumField(); index++ {
+ FieldVoFrom := voFrom.Field(index)
+ FieldToFrom := voFrom.Type().Field(index)
+
+ if FieldToFrom.IsExported() == false {
+ // err = errors.New(fmt.Sprintf("NOT Exported: FieldFrom.%s\n", FieldToFrom.Name))
+ continue
+ }
+
+ if FieldVoFrom.IsZero() {
+ // if reflection.IsRefZero(FieldVoSrc.Interface()) {
+ // err = errors.New(fmt.Sprintf("Is Zero: FieldFrom.%s (%v)\n", FieldToFrom.Name, FieldVoFrom.Interface()))
+ continue
+ }
+
+ if !FieldVoFrom.IsValid() {
+ // err = errors.New(fmt.Sprintf("Is NOT Valid: FieldFrom.%s (%v)\n", FieldToFrom.Name, FieldVoFrom.Interface()))
+ continue
+ }
+
+ // fmt.Printf("TAGS: %s\n", FieldToFrom.Tag)
+
+ FieldVoTo := reflect.ValueOf(ds).Elem().Field(index)
+ FieldToTo := reflect.TypeOf(ds).Elem().Field(index)
+ if !FieldVoTo.CanSet() {
+ err = errors.New(fmt.Sprintf("Cannot set: FieldTo.%s (%v)\n", FieldToTo.Name, FieldVoTo.Interface()))
+ break
+ }
+
+ switch FieldToFrom.Type.String() { // FieldVoFrom.Kind().String()
+ case "bool":
+ FieldVoTo.SetBool(FieldVoFrom.Bool())
+
+ case "string":
+ // if FieldVoSrc.String() == "" {
+ // break
+ // }
+ FieldVoTo.SetString(FieldVoFrom.String())
+
+ case "GoStruct.EndPointPath":
+ // We're not updating this field.
+
+ case "time.Time":
+ // We're not updating this field.
+
+ case "GoStruct.tagStrings":
+ // We're not updating this field.
+
+ default:
+ _, _ = fmt.Fprintf(os.Stderr,"DataTags.SetFrom() Unknown type %s (%s) for field '%s' from '%v' to '%v'\n",
+ FieldToFrom.Type, FieldVoFrom.Kind().String(),
+ FieldToFrom.Name,
+ FieldVoTo.Interface(), FieldVoFrom.Interface())
+ }
+ }
+
+ if !from.PointTimestamp.IsZero() {
+ ds.PointTimestamp = from.PointTimestamp
+ }
+
+ // @TODO - Fix this up.
+ ds.StrBool.Required = StrSet(from.StrBool.Required, ds.StrBool.Required)
+ ds.StrBool.PointIdReplace = StrSet(from.StrBool.PointIdReplace, ds.StrBool.PointIdReplace)
+ ds.StrBool.PointIgnore = StrSet(from.StrBool.PointIgnore, ds.StrBool.PointIgnore)
+ ds.StrBool.PointIgnoreZero = StrSet(from.StrBool.PointIgnoreZero, ds.StrBool.PointIgnoreZero)
+ ds.StrBool.PointArrayFlatten = StrSet(from.StrBool.PointArrayFlatten, ds.StrBool.PointArrayFlatten)
+ ds.StrBool.DataTable = StrSet(from.StrBool.DataTable, ds.StrBool.DataTable)
+ ds.StrBool.DataTableChild = StrSet(from.StrBool.DataTableChild, ds.StrBool.DataTableChild)
+ ds.StrBool.DataTableMerge = StrSet(from.StrBool.DataTableMerge, ds.StrBool.DataTableMerge)
+ ds.StrBool.DataTableShowIndex = StrSet(from.StrBool.DataTableShowIndex, ds.StrBool.DataTableShowIndex)
+ // ds.Endpoint = src.Endpoint.Copy()
+ }
+
+ return err
+}
+
+func StrSet(src string, dst string) string {
+ if dst != "" {
+ return dst
+ }
+ return src
+}
+
+
// Reflect - Combines all the common reflect work into one package
// So we don't have to keep repeating ourselves.
type Reflect struct {
- Valid bool
- DataStructure DataStructure
- Parent interface{}
- Interface interface{}
- IsNil bool
- IsExported bool
- isUnknown bool
+ FieldPath EndPointPath
+ ParentReflect *Reflect
+ CurrentReflect *Reflect
+ ChildReflect []*Reflect
+
+ Valid bool
+ DataStructure DataTags
+ GoStructs struct {
+ Parent *DataTags
+ Current *DataTags
+ }
+
+ Interface interface{}
+ IsNil bool
+ IsExported bool
+ isUnknown bool
+ IsOk bool
+ Value valueTypes.UnitValues
+ InterfaceValue interface{}
+ IsStart bool
+
+ Index int
+ Length int
+ FieldName string
Kind reflect.Kind
TypeOf reflect.Type
ValueOf reflect.Value
-
- Length int
- FieldName string
FieldTo reflect.StructField
FieldVo reflect.Value
}
@@ -40,34 +432,70 @@ func (r Reflect) String() string {
if strings.HasPrefix(fn, " 0 {
- f = fmt.Sprintf("%%.%dd", valueTypes.SizeOfInt(current.Length))
- }
- f = fmt.Sprintf(f, index)
-
- r.DataStructure.Endpoint = current.DataStructure.Endpoint.Copy() // name.Copy()
- r.DataStructure.Endpoint.Append(f)
-
- if r.isUnknown {
- r.DataStructure.Json = current.DataStructure.PointId
- r.DataStructure.PointId = current.DataStructure.PointId
- r.DataStructure.PointUnit = current.DataStructure.PointUnit
- break
- }
- r.DataStructure.Json = current.DataStructure.PointId + "_" + f
- r.DataStructure.PointId = current.DataStructure.PointId + "_" + f
- r.DataStructure.PointUnit = current.DataStructure.PointUnit
- break
- }
-
- if current.TypeOf.Kind() == reflect.Map {
+ case reflect.Map:
+ r.Length = len(r.ValueOf.MapKeys())
// pt = reflect.TypeOf(parent)
// r.FieldTo = current.TypeOf.Field(index)
// r.IsExported = r.FieldTo.IsExported()
@@ -229,192 +599,773 @@ func (r *Reflect) SetByIndex(parent Reflect, current Reflect, index int, indexNa
r.IsExported = true
// mk := current.ValueOf.MapKeys()
// r.FieldVo = current.ValueOf.MapIndex(mk[index])
- r.FieldVo = current.ValueOf.MapIndex(indexName)
- r.FieldName = current.FieldName // mk[index].String()
+ // r.FieldVo = current.ValueOf.MapIndex(indexName)
+ // r.FieldName = current.FieldName // mk[index].String()
- r.DataStructure = r.DataStructure.Set(parent.Interface, current.Interface, r.FieldTo, r.FieldVo)
- // r.DataStructure.Json = current.ValueOf.MapIndex(indexName).String()
- // r.DataStructure.PointId = current.ValueOf.MapIndex(indexName).String()
- r.DataStructure.Json = indexName.String()
- r.DataStructure.PointId = indexName.String()
- // r.DataStructure.Json = r.FieldVo.String()
- // r.DataStructure.PointId = r.FieldVo.String()
+ r.DataStructure.GetTags(r.ParentReflect, r.CurrentReflect, r.FieldTo, r.FieldVo)
+ r.SetGoStructOptions()
+ r.DataStructure.UpdateTags(r.ParentReflect, r.CurrentReflect)
- r.DataStructure.Endpoint = current.DataStructure.Endpoint.Copy() // name.Copy()
- r.DataStructure.Endpoint.Append(r.DataStructure.PointId)
- break
+ r.InterfaceValue = r.FieldVo.Interface()
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ r.InterfaceValue, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
}
+
+ r.SetPointId()
}
}
-// setPointName - Are we using an index number for name or field key value?
-func (r *Reflect) setPointName(parent Reflect, current Reflect, name EndPointPath, index int) EndPointPath {
+func (r *Reflect) SetByIndex(parent *Reflect, current *Reflect, index int, indexName reflect.Value) {
for range Only.Once {
- var pn string
- var intSize int
- switch current.Kind {
- case reflect.Array:
- fallthrough
+ r.ParentReflect = parent
+ r.CurrentReflect = current
+ current.ChildReflect = append(current.ChildReflect, r)
+
+ switch current.TypeOf.Kind() {
+ case reflect.Struct:
+ if !current.TypeOf.Field(index).IsExported() {
+ return
+ }
+ r.Interface = current.ValueOf.Field(index).Interface()
+
case reflect.Slice:
- ft := valueTypes.GetIntFormatForPrintf(r.Length)
- pn = fmt.Sprintf(ft, index)
- intSize = valueTypes.SizeOfInt(r.Length)
+ fallthrough
+ case reflect.Array:
+ r.Interface = current.ValueOf.Index(index).Interface()
case reflect.Map:
- // mk := reflect.ValueOf(current).MapKeys()
- // pn = mk[index].String()
- pn = r.DataStructure.PointId
-
- case reflect.Struct:
- pn = r.DataStructure.PointId
+ r.Interface = current.ValueOf.MapIndex(indexName).Interface()
}
- switch {
- case r.DataStructure.PointNameFromChild != "":
- // PointNameFromChild - In this case points to a field within a CHILD struct.
- pn = reflection.GetPointNameFrom(current.Interface, r.DataStructure.PointNameFromChild, intSize, r.DataStructure.PointNameDateFormat)
- if r.DataStructure.PointNameAppend == false {
- // name = append(name[:len(name) - 1], pn)
- name.PopLast()
- } else {
- // name = append(name, pn)
- }
- name.Append(pn)
+ r.isUnknown = valueTypes.IsUnknownStruct(r.Interface)
+ r.TypeOf = reflect.TypeOf(r.Interface)
+ r.ValueOf = reflect.ValueOf(r.Interface)
+ r.IsNil = valueTypes.IsNil(r.Interface)
+ if r.IsNil {
+ r.Kind = reflect.Invalid
+ } else {
+ r.Kind = r.TypeOf.Kind()
+ }
+ r.Index = index
- case r.DataStructure.PointNameFromParent != "":
- // PointNameFromChild - In this case points to a field within a CHILD struct.
- pn = reflection.GetPointNameFrom(parent.Interface, r.DataStructure.PointNameFromParent, intSize, r.DataStructure.PointNameDateFormat)
- if r.DataStructure.PointNameAppend == false {
- // name = append(name[:len(name) - 1], pn)
- name.PopLast()
- } else {
- // name = append(name, pn)
- }
- name.Append(pn)
+ switch r.Kind {
+ case reflect.Struct:
+ r.Length = r.ValueOf.NumField()
+
+ case reflect.Slice:
+ fallthrough
+ case reflect.Array:
+ r.Length = r.ValueOf.Len()
+
+ case reflect.Map:
+ r.Length = len(r.ValueOf.MapKeys())
default:
- if r.DataStructure.PointNameAppend == false {
- // name = append(name[:len(name) - 1], pn)
- name.PopLast()
- } else {
- // name = append(name, pn)
- }
- name.Append(pn)
+ r.Length = valueTypes.IgnoreLength
}
- }
+ r.Valid = true
- return name
+ switch current.TypeOf.Kind() {
+ case reflect.Struct:
+ r.FieldTo = current.TypeOf.Field(index)
+ r.IsExported = r.FieldTo.IsExported()
+ r.FieldVo = current.ValueOf.Field(index)
+ r.FieldName = r.FieldTo.Name
+ r.FieldPath = r.CurrentReflect.FieldPath.Copy()
+ r.FieldPath.Append(r.FieldName)
+
+ if strings.Contains(r.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+ r.DataStructure.GetTags(parent, current, r.FieldTo, r.FieldVo)
+ r.SetGoStructOptions()
+ r.DataStructure.UpdateTags(parent, current)
+
+ r.InterfaceValue = r.FieldVo.Interface()
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ r.InterfaceValue, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ if r.Value.Unit() != "" {
+ r.DataStructure.PointUnit = r.Value.Unit()
+ }
+
+ case reflect.Slice:
+ fallthrough
+ case reflect.Array:
+ r.FieldTo = reflect.StructField{}
+ r.IsExported = true
+ r.FieldVo = current.ValueOf.Index(index)
+ r.FieldName = current.FieldName // r.FieldVo.String()
+ r.FieldPath = r.CurrentReflect.FieldPath.Copy()
+ r.FieldPath.Append("[" + strconv.Itoa(r.Index) + "]")
+
+ if strings.Contains(r.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+ r.DataStructure.GetTags(parent, current, r.FieldTo, r.FieldVo)
+ r.SetGoStructOptions()
+ r.DataStructure.UpdateTags(parent, current)
+
+ r.InterfaceValue = r.FieldVo.Interface()
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ r.InterfaceValue, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ if r.Value.Unit() != "" {
+ r.DataStructure.PointUnit = r.Value.Unit()
+ }
+
+ if r.Length == 0 {
+ r.DataStructure.PointIdReplace = true
+ }
+
+ r.DataStructure.Json = current.DataStructure.PointId
+ r.DataStructure.PointId = current.DataStructure.PointId
+ r.DataStructure.PointUnit = current.DataStructure.PointUnit
+ if !r.isUnknown {
+ f := "%d"
+ if current.Length > 0 {
+ f = fmt.Sprintf("%%.%dd", valueTypes.SizeOfInt(current.Length))
+ }
+ f = fmt.Sprintf(f, index)
+ r.DataStructure.Json = current.DataStructure.PointId + "_" + f
+ r.DataStructure.PointId = current.DataStructure.PointId + "_" + f
+ r.DataStructure.PointUnit = current.DataStructure.PointUnit
+ }
+
+ case reflect.Map:
+ r.FieldTo = reflect.StructField{}
+ r.IsExported = true
+ r.FieldVo = current.ValueOf.MapIndex(indexName)
+ r.FieldName = current.FieldName // mk[index].String()
+ r.FieldPath = r.CurrentReflect.FieldPath.Copy()
+ r.FieldPath.Append("[" + indexName.String() + "]")
+
+ if strings.Contains(r.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+ r.DataStructure.GetTags(parent, current, r.FieldTo, r.FieldVo)
+ r.SetGoStructOptions()
+ r.DataStructure.UpdateTags(parent, current)
+
+ r.InterfaceValue = r.FieldVo.Interface()
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ // map[string]interface{}{ indexName.String(): r.InterfaceValue }, r.DataStructure.PointUnit,
+ r.InterfaceValue, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ if r.Value.Unit() != "" {
+ r.DataStructure.PointUnit = r.Value.Unit()
+ }
+ r.Value.First().SetKey(indexName.String())
+
+ r.DataStructure.Json = indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String()
+ r.DataStructure.PointId = indexName.String() // current.ValueOf.MapIndex(indexName).String() || r.FieldVo.String()
+
+ default:
+ r.Interface = current.Interface
+ }
+
+ r.SetPointId()
+ }
}
-func (r *Reflect) PointNameFromChild(child *Reflect) EndPointPath {
+func (r *Reflect) SetValue(value interface{}) {
for range Only.Once {
- if r.DataStructure.PointNameFromChild != "" {
- // PointNameFromChild - In this case points to a field within a CHILD struct.
- pn := reflection.GetPointNameFrom(child.Interface, r.DataStructure.PointNameFromChild, 0, r.DataStructure.PointNameDateFormat)
- // child.DataStructure.Endpoint.Append(pn)
- // if child.DataStructure.PointNameAppend == false {
- child.DataStructure.Endpoint.PopLast()
- // }
- child.DataStructure.Endpoint.Append(pn)
- }
+ r.InterfaceValue = value
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ value, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
}
- return child.DataStructure.Endpoint
}
-
-func FindStart(fieldName string, Parent Reflect, Current Reflect, name EndPointPath) *Reflect {
- var ret Reflect
-
+func (r *Reflect) SetValues(values ...interface{}) {
for range Only.Once {
- if Current.Kind == reflect.Pointer {
- // Special case:
- // We're going to change the pointer to a proper object reference.
- if Current.IsNil {
- break
+ r.InterfaceValue = values
+ var uvs valueTypes.UnitValues
+ for _, value := range values {
+ var uvs2 valueTypes.UnitValues
+ uvs2, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ value, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ for _, uv := range uvs2 {
+ uvs = append(uvs, uv)
}
- ref2 := Current.ValueOf.Elem().Interface()
- if valueTypes.IsNil(ref2) {
- break
- }
- Current.SetByFieldName(Current.Interface, ref2, "")
- if Current.IsNil {
- break
- }
- // DO NOT BREAK!
- // KEEP FIRST!
}
+ }
+}
- if Current.Kind == reflect.Struct {
- // Iterate over all available fields and read the tag value
- for si := 0; si < Current.Length; si++ {
- var Child Reflect
- Child.SetByIndex(Parent, Current, si, reflect.Value{})
- if Child.FieldName == fieldName {
- // if !Child.DataStructure.PointNameAppend {
- // Child.DataStructure.Endpoint = Child.DataStructure.Endpoint.PopLast()
- // }
- // Child.DataStructure.Endpoint = name.Append(Child.DataStructure.PointId)
- ret = Child
- break
+func (r *Reflect) SetUnitValue(value valueTypes.UnitValue) {
+ for range Only.Once {
+ r.InterfaceValue = value
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ value, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ }
+}
+
+func (r *Reflect) SetUnitValues(value valueTypes.UnitValues) {
+ for range Only.Once {
+ r.InterfaceValue = value
+ r.Value, r.IsNil, r.IsOk = valueTypes.AnyToUnitValue(
+ value, r.DataStructure.PointUnit,
+ r.DataStructure.PointValueType, r.DataStructure.PointNameDateFormat)
+ }
+}
+
+// SetPointId - Sets the EndPointPath based off struct tags?
+func (r *Reflect) SetPointId() EndPointPath {
+ for range Only.Once {
+ if strings.Contains(r.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+
+ r.DataStructure.Endpoint = r.CurrentReflect.CopyEndPointPath()
+ // fmt.Printf("[ ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ var pn string
+
+ switch {
+ case r.DataStructure.PointIdFromChild != "":
+ // PointIdFromChild - In this case points to a field within a CHILD struct.
+ // fmt.Printf("[PointIdFromChild1] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ var pns []string
+ for _, pid := range strings.Split(r.DataStructure.PointIdFromChild, ".") {
+ p := reflection.GetStringFrom(r.Interface, r.Index, pid) // Look forward into structure.
+ if p == "" {
+ continue
+ }
+ pns = append(pns, p)
+ }
+ pn = strings.Join(pns, ".") // pns = append(pns, r.DataStructure.PointId)
+ r.DataStructure.Endpoint.Append(r.DataStructure.PointId)
+ // fmt.Printf("[PointIdFromChild2] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ if r.DataStructure.PointIdReplace {
+ r.DataStructure.Endpoint.PopLast()
+ // fmt.Printf("[PointIdFromChild3] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ }
+ if pn != "" {
+ r.DataStructure.Endpoint.Append(pn)
+ // fmt.Printf("[PointIdFromChild4] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
}
- if Child.Kind != reflect.Struct {
- continue
+ case r.DataStructure.PointIdFrom != "":
+ // PointIdFromChild - In this case points to a field within a CHILD struct.
+ // fmt.Printf("[PointIdFrom1 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ var pns []string
+ for _, pid := range strings.Split(r.DataStructure.PointIdFrom, ".") {
+ p := reflection.GetStringFromStruct(r.Interface, pid) // Look forward into structure.
+ if p == "" {
+ continue
+ }
+ pns = append(pns, p)
+ }
+ if len(pns) == 0 {
+ for _, pid := range strings.Split(r.DataStructure.PointIdFrom, ".") {
+ p := reflection.GetStringFromStruct(r.CurrentReflect.Interface, pid)
+ if p == "" {
+ continue
+ }
+ pns = append(pns, p)
+ }
}
- if Child.IsKnown() {
- continue
+ if r.DataStructure.PointId != "" {
+ pns = append(pns, r.DataStructure.PointId)
+ }
+ pn = strings.Join(pns, ".")
+ r.DataStructure.Endpoint.Append(r.DataStructure.PointId)
+ // fmt.Printf("[PointIdFrom2 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ if r.DataStructure.PointIdReplace {
+ r.DataStructure.Endpoint.PopLast()
+ // fmt.Printf("[PointIdFrom3 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ }
+ if pn != "" {
+ r.DataStructure.Endpoint.Append(pn)
+ // fmt.Printf("[PointIdFrom4 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
}
- Child = *FindStart(fieldName, Current, Child, name)
- // if Child.FieldName == fieldName {
- // name = name.Append(Child.DataStructure.PointId)
- // ret = Child
- // break
+ // case r.DataStructure.PointIdFromParent != "":
+ // // PointIdFromParent - In this case points to a field within a PARENT struct.
+ // // We also already have the parent.
+ // // @TODO - Need to fix this up.
+ // for _, child := range r.ParentReflect.ChildReflect {
+ // if child.FieldName == r.DataStructure.PointIdFromChild {
+ // dateFormat := child.DataStructure.PointNameDateFormat
+ // if dateFormat == "" {
+ // dateFormat = valueTypes.DateTimeAltLayout
+ // }
+ // intSize := valueTypes.SizeOfInt(r.CurrentReflect.Length)
+ // pn = valueTypes.AnyToValueString(child.InterfaceValue, intSize, dateFormat)
+ // break
+ // }
+ // }
+
+ default:
+ // pn = r.DataStructure.PointId
+ // fmt.Printf("[default ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ switch r.CurrentReflect.Kind {
+ case reflect.Array:
+ fallthrough
+ case reflect.Slice:
+ // ds, _ := GetChildGoStruct(r.CurrentReflect.Interface, 1)
+ // if ds != nil {
+ // // fmt.Printf("DT:%v\n", ds)
+ // if ds.PointIdFrom != "" {
+ // pn = ""
+ // break
+ // }
+ // }
+ // PointIdFrom
+ // var pns []string
+ // for _, pid := range strings.Split(ds.PointIdFrom, ".") {
+ // pns = append(pns, reflection.GetStringFromStruct(r.CurrentReflect.Interface, pid))
+ // }
+ // pn = strings.Join(pns, ".")
+ // @TODO - A real hack.
+ if (r.CurrentReflect.DataStructure.PointIdFrom == "") && (r.CurrentReflect.DataStructure.PointIdFromChild == "") {
+ ft := valueTypes.GetIntFormatForPrintf(r.CurrentReflect.Length)
+ pn = fmt.Sprintf(ft, r.Index)
+ if r.IsPointIdReplace() {
+ pn = r.DataStructure.PointId + "_" + pn
+ }
+ if pn == "" {
+ pn = r.DataStructure.PointId
+ }
+ // fmt.Printf("[default3a ] pn: %s - EPP: %s\n", pn, r.DataStructure.Endpoint)
+ }
+
+ default:
+ pn = r.DataStructure.PointId
+ // fmt.Printf("[default3b ] pn: %s - EPP: %s\n", pn, r.DataStructure.Endpoint)
+ }
+ // r.DataStructure.Endpoint.Append(r.DataStructure.PointId)
+ // if r.DataStructure.PointIdReplace {
+ // r.DataStructure.Endpoint.PopLast()
// }
- }
- break
+ if pn != "" {
+ r.DataStructure.Endpoint.Append(pn)
+ // fmt.Printf("[default4 ] EPP: %s - FP: %s\n", r.DataStructure.Endpoint, r.FieldPath)
+ }
}
-
- if Current.Kind == reflect.Slice {
- // Iterate over all available fields and read the tag value
- for si := 0; si < Current.Length; si++ {
- var Child Reflect
- Child.SetByIndex(Parent, Current, si, reflect.Value{})
- if Child.FieldName == fieldName {
- // if !Child.DataStructure.PointNameAppend {
- // Child.DataStructure.Endpoint = Child.DataStructure.Endpoint.PopLast()
- // }
- // Child.DataStructure.Endpoint = name.Append(Child.DataStructure.PointId)
- ret = Child
- break
- }
-
- if Child.Kind != reflect.Slice {
- continue
- }
-
- if Child.IsKnown() {
- continue
- }
-
- Child = *FindStart(fieldName, Current, Child, name)
- }
- break
- }
-
- _, _ = fmt.Fprintf(os.Stderr,"ERROR: Field '%s' type not supported: Type %s\n", Current.FieldName, Current.Kind.String())
}
- return &ret
+ return r.DataStructure.Endpoint
}
+
+func (r *Reflect) IsTable() bool {
+ return r.DataStructure.DataTable
+}
+
+func (r *Reflect) IsNotTable() bool {
+ return !r.DataStructure.DataTable
+}
+
+func (r *Reflect) IsTableChild() (bool, int) {
+ var yes bool
+ var safeIterate int
+ for range Only.Once {
+ yes = r.isTableChild(&safeIterate)
+ }
+ return yes, safeIterate
+}
+
+func (r *Reflect) isTableChild(safeIterate *int) bool {
+ var yes bool
+ for range Only.Once {
+ *safeIterate++
+ if *safeIterate > 42 {
+ // Arbitrary limit of 42.
+ break
+ }
+
+ // Don't include this!
+ // if r.DataStructure.DataTableChild {
+ // yes = true
+ // break
+ // }
+
+ if r.DataStructure.DataTable {
+ yes = true
+ break
+ }
+
+ if r.CurrentReflect == nil {
+ break
+ }
+
+ if r.IsStart {
+ break
+ }
+
+ yes = r.CurrentReflect.isTableChild(safeIterate)
+ }
+ return yes
+}
+
+func (r *Reflect) IsPointArrayFlatten() bool {
+ return r.DataStructure.PointArrayFlatten
+}
+
+func (r *Reflect) IsPointIdReplace() bool {
+ return r.DataStructure.PointIdReplace
+}
+
+func (r *Reflect) IsNotPointIdReplace() bool {
+ return !r.DataStructure.PointIdReplace
+}
+
+func (r *Reflect) IsPointIgnore() bool {
+ return r.DataStructure.PointIgnore
+}
+
+func (r *Reflect) IsPointIgnoreZero() bool {
+ return r.DataStructure.PointIgnoreZero
+}
+
+func (r *Reflect) IsDataTableMerge() bool {
+ return r.DataStructure.DataTableMerge
+}
+
+func (r *Reflect) IsDataTableShowIndex() bool {
+ return r.DataStructure.DataTableShowIndex
+}
+
+func (r *Reflect) CountChildren() (int, int) {
+ var rows int
+ var cols int
+ for range Only.Once {
+ rows = len(r.ChildReflect)
+ for row := range r.ChildReflect {
+ col := len(r.ChildReflect[row].ChildReflect)
+ if cols < col {
+ cols = col
+ }
+ }
+ }
+ return rows, cols
+}
+
+func (r *Reflect) IsPointTimestampZero() bool {
+ return r.DataStructure.PointTimestamp.IsZero()
+}
+func (r *Reflect) IsPointTimestampNotZero() bool {
+ return !r.DataStructure.PointTimestamp.IsZero()
+}
+
+func (r *Reflect) AsJson() string {
+ var ret string
+ for range Only.Once {
+ j, err := json.Marshal(r.InterfaceValue)
+ if err != nil {
+ break
+ }
+ ret = string(j)
+ }
+ return ret
+}
+
+// SetGoStructOptions - Copies and updates DataTags from a GoStruct object.
+func (r *Reflect) SetGoStructOptions() bool {
+ var yes bool
+
+ // fmt.Printf("Current(enter): %s\n", r.DataStructure)
+ for range Only.Once {
+ if strings.Contains(r.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+
+ r.GoStructs.Parent, r.GoStructs.Current = GetChildGoStruct(r.Interface, 1)
+ if r.GoStructs.Current == nil {
+ r.GoStructs.Current = r.GetGoStruct()
+ }
+
+ if r.GoStructs.Current != nil {
+ yes = true
+ r.GoStructs.Current.UpdateTags(r.CurrentReflect, r)
+
+ err := r.DataStructure.SetFrom(r.GoStructs.Current)
+ if err != nil {
+ _, _ = fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+ }
+ }
+
+ if r.GoStructs.Parent != nil {
+ if r.CurrentReflect.IsGroup() {
+ yes = true
+ r.GoStructs.Parent.UpdateTags(r.CurrentReflect.CurrentReflect, r.CurrentReflect)
+
+ err := r.DataStructure.SetFrom(r.GoStructs.Parent)
+ if err != nil {
+ _, _ = fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+ }
+
+ if r.GoStructs.Parent.DataTable {
+ r.DataStructure.DataTable = false
+ r.DataStructure.DataTableChild = true
+ r.DataStructure.StrBool.DataTable = "false"
+ r.DataStructure.StrBool.DataTableChild = "true"
+
+ r.DataStructure.DataTableId = ""
+ r.DataStructure.DataTableName = ""
+ r.DataStructure.DataTableTitle = ""
+ r.DataStructure.DataTableMerge = false
+ r.DataStructure.DataTableShowIndex = false
+ r.DataStructure.DataTableSortOn = ""
+ }
+ break
+ }
+
+ if r.IsGroup() {
+ // fmt.Printf("IsGroup(): %t / %t\n", r.CurrentReflect.IsGroup(), r.IsGroup())
+ yes = true
+ r.GoStructs.Parent.UpdateTags(r.CurrentReflect, r)
+
+ err := r.DataStructure.SetFrom(r.GoStructs.Parent)
+ if err != nil {
+ _, _ = fmt.Fprintf(os.Stderr, "Error: %s\n", err)
+ }
+ }
+ }
+ }
+ // fmt.Printf("Current(exit): %s\n", r.DataStructure)
+ // fmt.Printf("GoStructs.Parent(exit): %s\n", r.GoStructs.Parent)
+ // fmt.Printf("GoStructs.Current(exit): %s\n", r.GoStructs.Current)
+
+ return yes
+}
+
+func (r *Reflect) IsGoStruct() bool {
+ var yes bool
+ for range Only.Once {
+ if r.FieldName == NameGoStruct {
+ yes = true
+ r.DataStructure.PointIgnore = true
+ break
+ }
+ if r.FieldName == NameGoStructParent {
+ yes = true
+ r.DataStructure.PointIgnore = true
+ break
+ }
+ yes = false
+ }
+ return yes
+}
+
+func (r *Reflect) IsGroup() bool {
+ var yes bool
+
+ switch {
+ case r == nil:
+ break
+
+ case r.Kind == reflect.Map:
+ yes = true
+
+ case r.Kind == reflect.Array:
+ yes = true
+
+ case r.Kind == reflect.Slice:
+ yes = true
+ }
+
+ return yes
+}
+
+func GetChildGoStruct(ref interface{}, limit int) (*DataTags, *DataTags) {
+ var parent *DataTags
+ var current *DataTags
+
+ for range Only.Once {
+ // Only scan the immediate children.
+ if limit < 0 {
+ break
+ }
+ limit--
+
+ vo := reflect.ValueOf(ref)
+ if vo.Kind() == reflect.Struct {
+ // Iterate over all available fields, looking for the parent GoStruct.
+ for i := 0; i < vo.NumField(); i++ {
+ fieldTo := vo.Type().Field(i)
+ fieldVo := vo.Field(i)
+
+ if fieldTo.Name != NameGoStructParent {
+ // Field name has to be GoStructParent
+ continue
+ }
+ if fieldTo.Type.String() != PkgGoStructParent {
+ // Package type has to be GoStruct.GoStructParent
+ continue
+ }
+ if !fieldTo.IsExported() {
+ continue
+ }
+
+ var dt DataTags
+ dt.GetTags(nil, nil, fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo
+ parent = &dt
+ break
+ }
+
+ // Iterate over all available fields, looking for the current GoStruct.
+ for i := 0; i < vo.NumField(); i++ {
+ fieldTo := vo.Type().Field(i)
+ fieldVo := vo.Field(i)
+
+ if fieldTo.Name != NameGoStruct {
+ // Field name has to be GoStruct
+ continue
+ }
+ if fieldTo.Type.String() != PkgGoStruct {
+ // Package type has to be GoStruct.GoStruct
+ continue
+ }
+ if !fieldTo.IsExported() {
+ continue
+ }
+
+ var dt DataTags
+ dt.GetTags(nil, nil, fieldTo, fieldVo) // &Reflect{Interface: ref}, &Reflect{Interface: fieldVo.Interface()}, fieldTo, fieldVo
+ current = &dt
+ break
+ }
+ }
+
+ if (vo.Kind() == reflect.Slice) || (vo.Kind() == reflect.Array) {
+ // Iterate over all available fields, looking for the field name.
+ for i := 0; i < vo.Len(); i++ {
+ parent, current = GetChildGoStruct(vo.Index(i).Interface(), limit)
+ if current != nil {
+ break
+ }
+ if parent != nil {
+ break
+ }
+ }
+ break
+ }
+ }
+
+ return parent, current
+}
+
+func (r *Reflect) HasGoStruct() bool {
+ var yes bool
+
+ for range Only.Once {
+ if r.CurrentReflect.CurrentReflect.GoStructs.Current != nil {
+ yes = true
+ break
+ }
+ if r.CurrentReflect.GoStructs.Current != nil {
+ yes = true
+ break
+ }
+ }
+
+ return yes
+}
+
+func (r *Reflect) GetGoStruct() *DataTags {
+ var tags *DataTags
+
+ for range Only.Once {
+ // if r.CurrentReflect.GoStruct != nil {
+ // fmt.Printf("GOSTRUCT r.CurrentReflect.GoStruct[%s] - %s\n", r.CurrentReflect.FieldPath, r.CurrentReflect.GoStruct)
+ // tags = r.CurrentReflect.GoStruct
+ // break
+ // }
+ if r.CurrentReflect.CurrentReflect.GoStructs.Current != nil {
+ // fmt.Printf("GOSTRUCT r.CurrentReflect.CurrentReflect.GoStruct[%s] - %s\n", r.CurrentReflect.CurrentReflect.FieldPath, r.CurrentReflect.GoStruct)
+ tags = r.CurrentReflect.CurrentReflect.GoStructs.Current
+ break
+ }
+ }
+
+ return tags
+}
+
+func (r *Reflect) GetGoStructCurrent() *Reflect {
+ var current *Reflect
+
+ for range Only.Once {
+ // if r.CurrentReflect.GoStruct != nil {
+ // fmt.Printf("GOSTRUCT r.CurrentReflect.GoStruct[%s] - %s\n", r.CurrentReflect.FieldPath, r.CurrentReflect.GoStruct)
+ // current = r.CurrentReflect
+ // break
+ // }
+ if r.CurrentReflect.CurrentReflect.GoStructs.Current != nil {
+ // fmt.Printf("GOSTRUCT r.CurrentReflect.CurrentReflect.GoStruct[%s] - %s\n", r.CurrentReflect.CurrentReflect.FieldPath, r.CurrentReflect.GoStruct)
+ current = r.CurrentReflect.CurrentReflect
+ break
+ }
+ }
+
+ return current
+}
+
+func (r *Reflect) IsGoStructForParent() bool {
+ var yes bool
+
+ for range Only.Once {
+ voSrc := reflect.ValueOf(*r)
+ t := voSrc.Type()
+ s := t.Kind().String()
+ if s == NameGoStructParent {
+ yes = true
+ }
+ if s == PkgGoStructParent {
+ yes = true
+ }
+ }
+
+ return yes
+}
+
+func (r *Reflect) PointIgnoreChildIfFromNil() bool {
+ var yes bool
+ for range Only.Once {
+ if r.ParentReflect.DataStructure.PointIgnoreChildIfFromNil == "" {
+ // If parent doesn't care about a zero value.
+ yes = false
+ break
+ }
+
+ ret := reflection.GetStringFrom(r.Interface, r.Index, r.ParentReflect.DataStructure.PointIgnoreChildIfFromNil)
+ if ret == "" {
+ yes = false
+ break
+ }
+
+ yes = r.IsNil
+ }
+ return yes
+}
+
+func (r *Reflect) EndPointPath() *EndPointPath {
+ return &r.DataStructure.Endpoint
+}
+
+func (r *Reflect) GetFieldPath() EndPointPath {
+ return r.FieldPath
+}
+
+func (r *Reflect) CopyEndPointPath() EndPointPath {
+ return r.DataStructure.Endpoint.Copy()
+}
+
+func (r *Reflect) SetEndPointPath(epp EndPointPath) *EndPointPath {
+ r.DataStructure.Endpoint = epp
+ return &r.DataStructure.Endpoint
+}
+
+func (r *Reflect) PointId() string {
+ return r.DataStructure.PointId
+}
+
+
func GetStructFields(ref interface{}) map[string]string {
ret := make(map[string]string)
for range Only.Once {
var Ref Reflect
- Ref.SetByFieldName(ref, ref, "")
+ Ref.Init(ref, ref, EndPointPath{})
if Ref.Kind == reflect.Struct {
if Ref.Length == 0 {
@@ -426,7 +1377,7 @@ func GetStructFields(ref interface{}) map[string]string {
// Iterate over all available fields and read the tag value
for i := 0; i < Ref.Length; i++ {
var Child Reflect
- Child.SetByIndex(Ref, Ref, i, reflect.Value{})
+ Child.SetByIndex(&Ref, &Ref, i, reflect.Value{})
if !Child.IsExported {
continue
@@ -441,12 +1392,12 @@ func GetStructFields(ref interface{}) map[string]string {
return ret
}
-func GetStructFieldsAsArray(ref interface{}) []string {
+func GetStructFieldsAsArray(ref *Reflect) []string {
var ret []string
for range Only.Once {
var Ref Reflect
- Ref.SetByFieldName(ref, ref, "")
+ Ref.Init(ref, ref, EndPointPath{})
if Ref.Kind == reflect.Struct {
if Ref.Length == 0 {
@@ -458,7 +1409,7 @@ func GetStructFieldsAsArray(ref interface{}) []string {
// Iterate over all available fields and read the tag value
for i := 0; i < Ref.Length; i++ {
var Child Reflect
- Child.SetByIndex(Ref, Ref, i, reflect.Value{})
+ Child.SetByIndex(&Ref, &Ref, i, reflect.Value{})
if !Child.IsExported {
continue
@@ -472,12 +1423,12 @@ func GetStructFieldsAsArray(ref interface{}) []string {
return ret
}
-func GetStructValuesAsArray(ref interface{}) []string {
+func GetStructValuesAsArray(ref *Reflect) []string {
var ret []string
for range Only.Once {
var Ref Reflect
- Ref.SetByFieldName(ref, ref, "")
+ Ref.Init(ref, ref, EndPointPath{})
if Ref.Kind == reflect.Struct {
if Ref.Length == 0 {
@@ -489,7 +1440,7 @@ func GetStructValuesAsArray(ref interface{}) []string {
// Iterate over all available fields and read the tag value
for i := 0; i < Ref.Length; i++ {
var Child Reflect
- Child.SetByIndex(Ref, Ref, i, reflect.Value{})
+ Child.SetByIndex(&Ref, &Ref, i, reflect.Value{})
if !Child.IsExported {
continue
diff --git a/iSolarCloud/api/GoStruct/struct_table.go b/iSolarCloud/api/GoStruct/struct_table.go
deleted file mode 100644
index 0ed10735e..000000000
--- a/iSolarCloud/api/GoStruct/struct_table.go
+++ /dev/null
@@ -1,518 +0,0 @@
-package GoStruct
-
-import (
- "GoSungrow/iSolarCloud/api/GoStruct/output"
- "GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
- "fmt"
- "github.com/MickMake/GoUnify/Only"
- "os"
- "reflect"
-)
-
-
-type DataTables struct {
- Map []*DataTable
- Merge bool
- Index bool
-}
-
-func (dts *DataTables) Get() []*DataTable {
- // for index, val := range dt.Map {
- // val.Reflect.String()
- // }
- return dts.Map
-}
-
-func (dts *DataTables) GetTables(timestamp valueTypes.DateTime, parentDeviceId string) output.Tables {
- ret := make(output.Tables)
- for range Only.Once {
- for k, v := range dts.GetDataTables() {
- ret[k] = v
- }
- for k, v := range dts.GetDataMergedTables(timestamp, parentDeviceId) {
- ret[k] = v
- }
- }
- return ret
-}
-
-func (dts *DataTables) GetDataMergedTables(timestamp valueTypes.DateTime, parentDeviceId string) output.Tables {
- ret := make(output.Tables)
- for range Only.Once {
- if !dts.Merge {
- break
- }
-
- var data [][]interface{}
- var headers []string
-
- if dts.Index {
- headers = append(headers, "Date/Time", "Index")
- }
-
- var name string
- for _, f := range dts.Get() {
- if f == nil {
- continue
- }
- if !f.Reflect.DataStructure.DataTable {
- continue
- }
-
- dt := f.GetTable()
- for index := range dt.Headers {
- headers = append(headers, dt.Headers[index])
- }
- name = dt.EndPoint.String()
- fmt.Printf("Name:%s\n", name)
- for rowIndex := range dt.Data {
- if data == nil {
- data = make([][]interface{}, 0)
- }
- for _, col := range dt.Data[rowIndex] {
- if col.DataStructure.PointNameDateFormat == "" {
- col.DataStructure.PointNameDateFormat = valueTypes.DateTimeLayout
- }
- value, _, _ := valueTypes.AnyToUnitValue(col.DataStructure.Value, col.DataStructure.PointUnit,
- col.DataStructure.PointValueType, col.DataStructure.PointNameDateFormat)
-
- if (len(data) - 1) < rowIndex {
- var d []interface{}
- d = append(d, value[0].String())
- data = append(data, d)
- continue
- }
- data[rowIndex] = append(data[rowIndex], value[0].String())
- }
- }
- }
-
- if dts.Index {
- for i := range data {
- var t []interface{}
- t = append(t, timestamp.String(), i)
- data[i] = append(t, data[i]...)
- }
- }
-
- table := output.NewTable(headers...)
- for i := range data {
- _ = table.AddRow(data[i]...)
- }
- // _ = table.SetHeader(headers...)
- table.SetTitle("Table %s-%s - (%s)", name, parentDeviceId)
- table.SetFilePrefix("%s-%s-%s", name, parentDeviceId)
- table.SetGraphFilter("")
- ret[name] = table
- }
- return ret
-}
-
-func (dts *DataTables) GetDataTables() output.Tables {
- ret := make(output.Tables)
- for range Only.Once {
- if dts.Merge {
- break
- }
-
- for _, f := range dts.Map {
- if !f.Reflect.DataStructure.DataTable {
- continue
- }
-
- dt := f.GetTable()
- table := output.NewTable(dt.Headers...)
- for rowIndex := range dt.Data {
- // fmt.Printf("ROW[%d] - %v\n", rowIndex, dt.Data[rowIndex])
- var data []interface{}
- for _, col := range dt.Data[rowIndex] {
- // fmt.Printf("\tCOL[%d][%d] - %s - %s - %v\n", rowIndex, colIndex,
- // dt.Data[rowIndex][colIndex].FieldName,
- // dt.Data[rowIndex][colIndex].DataStructure.PointId,
- // dt.Data[rowIndex][colIndex].DataStructure.Value,
- // )
- if col.DataStructure.PointNameDateFormat == "" {
- col.DataStructure.PointNameDateFormat = valueTypes.DateTimeLayout
- }
- value, _, _ := valueTypes.AnyToUnitValue(col.DataStructure.Value, col.DataStructure.PointUnit,
- col.DataStructure.PointValueType, col.DataStructure.PointNameDateFormat)
-
- data = append(data, value[0].String())
- }
- _ = table.AddRow(data...)
- }
- title := dt.Reflect.DataStructure.DataTableTitle
- if title == "" {
- title = dt.Reflect.DataStructure.DataTableName
- }
- if title == "" {
- title = dt.Reflect.DataStructure.DataTableId
- }
-
- table.SetTitle("Data table %s - %s - %s", dt.Name, dt.EndPoint.String(), title)
- table.SetFilePrefix("%s-%s", dt.EndPoint.String(), dt.Reflect.DataStructure.DataTableId)
- table.SetGraphFilter("")
- table.Sort(dt.SortOn)
- ret[dt.Reflect.DataStructure.DataTableId] = table
- }
- }
- return ret
-}
-
-
-type DataTable struct {
- Reflect *Reflect
- Name string
- EndPoint EndPointPath
- SortOn string
- Headers []string
- Data [][]*Reflect
- Debug bool
-}
-
-func (dss *DataStructures) AddTable(ref *Reflect) *DataTable {
- var ret *DataTable
- for range Only.Once {
- if ref.FieldName == NameGoStruct {
- break
- }
-
- if dss.DataTables.Map == nil {
- dss.DataTables.Map = []*DataTable{}
- }
- ret = &DataTable {
- Reflect: ref,
- Name: ref.DataStructure.DataTableId,
- EndPoint: ref.DataStructure.Endpoint,
- SortOn: ref.DataStructure.DataTableSortOn,
- Headers: nil,
- Data: nil,
- }
- dss.DataTables.Map = append(dss.DataTables.Map, ret)
- // dss.DataTables.SortOn = ref.DataStructure.DataTableSortOn
- dss.DataTables.Merge = ref.DataStructure.DataTableMerge
- dss.DataTables.Index = ref.DataStructure.DataTableShowIndex
- if dss.Debug {
- _, _ = fmt.Fprintf(os.Stderr, "DEBUG DataStructures.AddTable() %s - Kind:'%s' Type:'%s'\n",
- ref.DataStructure.Endpoint.String(), ref.DataStructure.ValueKind, ref.DataStructure.ValueType)
- }
- }
- return ret
-}
-
-func (dt *DataTable) GetTable() DataTable {
-
- for range Only.Once {
- if dt.Debug {
- _, _ = fmt.Fprintf(os.Stderr,"GetTable() Current[%s]: %s\n", dt.Reflect.DataStructure.DataTableId, dt.Reflect)
- }
- if !dt.Reflect.DataStructure.DataTable {
- break
- }
-
- if dt.Reflect.Kind == reflect.Pointer {
- // Special case:
- // We're going to change the pointer to a proper object reference.
- if dt.Reflect.IsNil {
- break
- }
- ref2 := dt.Reflect.ValueOf.Elem().Interface()
- if valueTypes.IsNil(ref2) {
- break
- }
- dt.Reflect.SetByFieldName(dt.Reflect.Interface, ref2, "")
- if dt.Reflect.IsNil {
- break
- }
- // DO NOT BREAK!
- // KEEP FIRST!
- }
-
- if dt.Reflect.Kind == reflect.Struct {
- // Handle slices here.
- for row := 0; row < dt.Reflect.Length; row++ {
- var Child Reflect
- Child.SetByIndex(*dt.Reflect, *dt.Reflect, row, reflect.Value{})
-
- if Child.IsKnown() {
- if row == 0 {
- dt.AddHeader(dt.Reflect)
- }
- dt.AddRow(&Child)
- continue
- }
-
- ok, refs := dt.GetTableStruct2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableMap2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableSlice2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
- }
- break
- }
-
- if dt.Reflect.Kind == reflect.Slice {
- // Handle slices here.
- for row := 0; row < dt.Reflect.Length; row++ {
- var Child Reflect
- Child.SetByIndex(*dt.Reflect, *dt.Reflect, row, reflect.Value{})
-
- if Child.IsKnown() {
- if row == 0 {
- dt.AddHeader(dt.Reflect)
- }
- dt.AddRow(&Child)
- continue
- }
-
- ok, refs := dt.GetTableStruct2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableMap2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableSlice2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
- }
- break
- }
-
- if dt.Reflect.Kind == reflect.Map {
- // Handle maps here.
- for row, rowMap := range dt.Reflect.FieldVo.MapKeys() {
- var Child Reflect
- Child.SetByIndex(*dt.Reflect, *dt.Reflect, row, rowMap)
-
- if Child.IsKnown() {
- if row == 0 {
- dt.AddHeader(dt.Reflect)
- }
- dt.AddRow(&Child)
- continue
- }
-
- ok, refs := dt.GetTableStruct2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableMap2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
-
- ok, refs = dt.GetTableSlice2(dt.Reflect, &Child)
- if ok {
- if row == 0 {
- dt.AddHeader(refs...)
- }
- dt.AddRow(refs...)
- continue
- }
- }
- break
- }
-
- _, _ = fmt.Fprintf(os.Stderr,"ERROR: Field '%s' type not supported (%s): Type %s\n",
- dt.Reflect.FieldName, dt.Reflect.DataStructure.DataTableId, dt.Reflect.Kind.String())
- }
-
- return *dt
-}
-
-func (dt *DataTable) GetTableMap2(Parent *Reflect, Child *Reflect) (bool, []*Reflect) {
- var ok bool
- var refs []*Reflect
-
- for range Only.Once {
- if Child.Kind != reflect.Map {
- break
- }
-
- ok = true
- for col, colMap := range dt.Reflect.FieldVo.MapKeys() {
- var ChildStruct Reflect
- ChildStruct.SetByIndex(*dt.Reflect, *Child, col, colMap)
-
- if dt.GoStructOptions(Parent, Child, &ChildStruct) {
- continue
- }
-
- if dt.Reflect.DataStructure.DataTableSortOn != "" {
- // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
- if dt.Reflect.DataStructure.DataTableSortOn == ChildStruct.FieldName {
- dt.SortOn = ChildStruct.DataStructure.PointName
- dt.Reflect.DataStructure.DataTableSortOn = ""
- }
- }
- refs = append(refs, &ChildStruct)
- }
- }
-
- return ok, refs
-}
-
-func (dt *DataTable) GetTableSlice2(Parent *Reflect, Child *Reflect) (bool, []*Reflect) {
- var ok bool
- var refs []*Reflect
-
- for range Only.Once {
- if Child.Kind != reflect.Slice {
- break
- }
-
- ok = true
- for col := 0; col < Child.Length; col++ {
- var ChildStruct Reflect
- ChildStruct.SetByIndex(*dt.Reflect, *Child, col, reflect.Value{})
-
- if dt.GoStructOptions(Parent, Child, &ChildStruct) {
- continue
- }
-
- if dt.Reflect.DataStructure.DataTableSortOn != "" {
- // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
- if dt.Reflect.DataStructure.DataTableSortOn == ChildStruct.FieldName {
- dt.SortOn = ChildStruct.DataStructure.PointName
- dt.Reflect.DataStructure.DataTableSortOn = ""
- }
- }
- refs = append(refs, &ChildStruct)
- }
- }
-
- return ok, refs
-}
-
-func (dt *DataTable) GetTableStruct2(Parent *Reflect, Child *Reflect) (bool, []*Reflect) {
- var ok bool
- var refs []*Reflect
-
- for range Only.Once {
- if Child.Kind != reflect.Struct {
- break
- }
-
- ok = true
- for col := 0; col < Child.Length; col++ {
- var ChildStruct Reflect
- ChildStruct.SetByIndex(*dt.Reflect, *Child, col, reflect.Value{})
-
- if dt.GoStructOptions(Parent, Child, &ChildStruct) {
- continue
- }
-
- if dt.Reflect.DataStructure.DataTableSortOn != "" {
- // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
- if dt.Reflect.DataStructure.DataTableSortOn == ChildStruct.FieldName {
- dt.SortOn = ChildStruct.DataStructure.PointName
- dt.Reflect.DataStructure.DataTableSortOn = ""
- }
- }
- refs = append(refs, &ChildStruct)
- }
- }
-
- return ok, refs
-}
-
-func (dt *DataTable) GoStructOptions(Parent *Reflect, Current *Reflect, Child *Reflect) bool {
- var yes bool
- for range Only.Once {
- if Parent.Kind == reflect.Slice {
- // @TODO - Need to check here if the parent is a slice.
- // If so - then "parent" is actually Parent.
- // If not - then "parent" is actually Current.
- }
-
- if Child.FieldName != NameGoStruct {
- break
- }
-
- yes = true
- }
- return yes
-}
-
-
-func (dt *DataTable) AddHeader(headers ...*Reflect) {
- for range Only.Once {
- for _, header := range headers {
- name := valueTypes.PointToName(header.DataStructure.PointId)
- if header.DataStructure.PointUnit != "" {
- name += " (" + header.DataStructure.PointUnit + ")"
- }
- dt.Headers = append(dt.Headers, name)
- }
- }
-}
-
-func (dt *DataTable) AddRow(refs ...*Reflect) {
- for range Only.Once {
- if dt.Data == nil {
- dt.Data = make([][]*Reflect, 0)
- }
-
- var row []*Reflect
- row = append(row, refs...)
- // for _, ref := range refs {
- // }
- dt.Data = append(dt.Data, row)
- }
-}
-
-func (dt *DataTable) GetRow(row int) []*Reflect {
- return dt.Data[row]
-}
-
-func (dt *DataTable) Get() [][]*Reflect {
- return dt.Data
-}
-
diff --git a/iSolarCloud/api/GoStruct/structmap.go b/iSolarCloud/api/GoStruct/structmap.go
new file mode 100644
index 000000000..18f628ce8
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/structmap.go
@@ -0,0 +1,1138 @@
+package GoStruct
+
+import (
+ "GoSungrow/iSolarCloud/api/GoStruct/reflection"
+ "GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
+ "fmt"
+ "github.com/MickMake/GoUnify/Only"
+ "os"
+ "reflect"
+ "strings"
+ "time"
+)
+
+
+type StructMapOptions struct {
+ StartAt string
+ Name EndPointPath
+ TimeStamp time.Time
+ Debug bool
+ AddUnexported bool // Add unexported values, (default: false).
+ AddUnsupported bool // Add unsupported types, (default: false).
+ AddInvalid bool // Add invalid types, (default: false).
+ AddEmpty bool // Add empty values, (default: false).
+ AddNil bool // Add nil values, (default: false).
+}
+
+type StructMap struct {
+ StructMapOptions
+
+ SortOn string
+ Start *Reflect
+ Map map[string]*Reflect
+ TableMap map[string]*Reflect
+ _Timestamp valueTypes.DateTime
+}
+
+func (sm *StructMap) PrintDebug(format string, args ...interface{}) {
+ if sm.Debug { _, _ = fmt.Fprintf(os.Stderr, format, args...) }
+}
+
+func (sm *StructMap) InitScan(current interface{}, options StructMapOptions) {
+ for range Only.Once {
+ sm.StructMapOptions = options
+
+ if sm.StructMapOptions.Name.IsZero() {
+ sm.StructMapOptions.Name = NewEndPointPath(reflection.GetName("", current))
+ }
+
+ sm._Timestamp = valueTypes.SetDateTimeValue(sm.StructMapOptions.TimeStamp)
+ if sm._Timestamp.IsZero() {
+ sm._Timestamp = valueTypes.SetDateTimeValue(time.Now())
+ }
+
+ var Parent Reflect
+ Parent.Init(current, current, sm.StructMapOptions.Name)
+ Parent.SetEndPointPath(sm.StructMapOptions.Name.Copy())
+
+ sm.PrintDebug("InitScan() EndPoint: '%s' Current: %s\n", sm.StructMapOptions.Name, sm.Start)
+
+ sm.Scan(&Parent, &Parent) // sm.Current)
+ // fmt.Printf("sm.Current size: %v\n", unsafe.Sizeof(sm.Current))
+ // fmt.Printf("sm.Map size: %v\n", unsafe.Sizeof(sm.Map))
+ }
+}
+
+func (sm *StructMap) Scan(Parent *Reflect, Current *Reflect) *StructMap {
+ for range Only.Once {
+ sm.PrintDebug("# Scan() Current: %s\n", Current)
+
+ if Current.Kind == reflect.Pointer {
+ // Special case:
+ // We're going to change the pointer to a proper object reference.
+ if Current.IsNil {
+ break
+ }
+ ref2 := Current.ValueOf.Elem().Interface()
+ if valueTypes.IsNil(ref2) {
+ break
+ }
+ Current.Init(Current, ref2, *Current.EndPointPath())
+ if Current.IsNil {
+ break
+ }
+ // DO NOT BREAK!
+ // KEEP FIRST!
+ }
+
+ switch Current.Kind {
+ case reflect.Slice:
+ fallthrough
+ case reflect.Array:
+ sm.ScanSlice(Parent, Current)
+
+ case reflect.Map:
+ sm.ScanMap(Parent, Current)
+
+ case reflect.Struct:
+ sm.ScanStruct(Parent, Current)
+
+ case reflect.Uintptr:
+ fallthrough
+ case reflect.Complex64:
+ fallthrough
+ case reflect.Complex128:
+ fallthrough
+ case reflect.Chan:
+ fallthrough
+ case reflect.Func:
+ fallthrough
+ case reflect.UnsafePointer:
+ sm.PrintDebug("Scan() IsUnsupported: %s\n", Current)
+ sm.IsUnsupported(Current)
+
+ case reflect.Interface:
+ sm.PrintDebug("Scan() IsUnsupported: %s\n", Current)
+ sm.IsUnsupported(Current)
+
+ case reflect.Invalid:
+ sm.PrintDebug("Scan() IsInvalid: %s\n", Current)
+ sm.IsInvalid(Current)
+
+ default:
+ if Current.IsGoStruct() {
+ break
+ }
+ sm.PrintDebug("Scan() IsUnsupported: %s\n", Current)
+ sm.IsUnsupported(Current)
+ }
+ }
+
+ return sm
+}
+
+func (sm *StructMap) ScanMap(Parent *Reflect, Current *Reflect) bool {
+ var ok bool
+
+ for range Only.Once {
+ if Current.Kind != reflect.Map {
+ break
+ }
+ sm.PrintDebug("# ScanMap() Current: %s\n", Current)
+
+ if sm.Process(Current) {
+ break
+ }
+
+ ok = true
+ if strings.Contains(Current.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+
+ for index, key := range Current.FieldVo.MapKeys() {
+ var Child Reflect
+ Child.SetByIndex(Parent, Current, index, key)
+ sm.PrintDebug("# ScanMap().SetByIndex() Child: %s\n", Child)
+
+ if sm.Process(&Child) {
+ continue
+ }
+
+ sm.Scan(Current, &Child)
+ }
+ }
+
+ return ok
+}
+
+func (sm *StructMap) ScanSlice(Parent *Reflect, Current *Reflect) bool {
+ var ok bool
+
+ for range Only.Once {
+ if Current.Kind != reflect.Slice {
+ break
+ }
+ sm.PrintDebug("# ScanSlice() Current: %s\n", Current)
+
+ if sm.Process(Current) {
+ break
+ }
+
+ ok = true
+ if strings.Contains(Current.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+
+ for index := 0; index < Current.Length; index++ {
+ var Child Reflect
+ Child.SetByIndex(Parent, Current, index, reflect.Value{})
+ sm.PrintDebug("# ScanSlice().SetByIndex() Child: %s\n", Child)
+
+ if sm.Process(&Child) {
+ continue
+ }
+
+ sm.Scan(Current, &Child)
+ }
+ }
+
+ return ok
+}
+
+func (sm *StructMap) ScanStruct(Parent *Reflect, Current *Reflect) bool {
+ var ok bool
+
+ for range Only.Once {
+ if Current.Kind != reflect.Struct {
+ break
+ }
+ sm.PrintDebug("# ScanStruct() Current: %s\n", Current)
+
+ if sm.Process(Current) {
+ break
+ }
+
+ ok = true
+ if strings.Contains(Current.FieldPath.String(), "PageList") {
+ fmt.Printf("")}
+
+ for index := 0; index < Current.Length; index++ {
+ var Child Reflect
+ Child.SetByIndex(Parent, Current, index, reflect.Value{})
+ sm.PrintDebug("# ScanStruct().SetByIndex() Child: %s\n", Child)
+
+ if sm.Process(&Child) {
+ continue
+ }
+
+ sm.Scan(Current, &Child)
+ }
+ }
+
+ return ok
+}
+
+func (sm *StructMap) Process(Child *Reflect) bool {
+ var ok bool
+
+ for range Only.Once {
+ sm.PrintDebug("Check() Child: %s\n", Child)
+
+ if Child.Kind == reflect.Invalid {
+ ok = true
+ break
+ }
+
+ if Child.IsGoStruct() {
+ // sm.SaveGoStructOptions(Child)
+ break
+ }
+
+ // // @TODO - sigh - A real hack. We're trying to avoid updating the direct child of the table.
+ // // if !Child.CurrentReflect.DataStructure.DataTable {
+ // // if Child.SetGoStructOptions() {
+ // // sm.IsTable(sm.GoStructOptionCurrent)
+ // // }
+ // // }
+ // }
+ //
+ // if !Child.CurrentReflect.DataStructure.DataTable {
+ // if Child.SetGoStructOptions(sm.GoStructOptions, sm.GoStructOptionCurrent) {
+ // sm.IsTable(sm.GoStructOptionCurrent)
+ // // Child.DataStructure.UpdateTags(Child.CurrentReflect, Child)
+ // Child.SetPointId()
+ // // Never exit.
+ // }
+ // }
+
+ if Child.FieldName == sm.StructMapOptions.StartAt {
+ // fmt.Printf("# SEARCHING(FOUND): %s\n", Child)
+ Child.IsStart = true
+ Child.ParentReflect = Child
+ sm.Start = Child
+ sm.StructMapOptions.StartAt = ""
+ sm.PrintDebug("DEBUG: sm.Start.EndPointPath(): %s\n", sm.Start.EndPointPath())
+ // @TODO - FIX THIS UP - need to check if the point_id is not this...
+ if sm.Start.EndPointPath().Last() == "result_data" {
+ sm.Start.EndPointPath().PopLast() // Remove "ResultData" from end.
+ sm.PrintDebug("DEBUG: sm.Start.EndPointPath().PopLast(): %s\n", sm.Start.EndPointPath())
+ }
+
+ sm.PrintDebug( "DEBUG: sm.StructMapOptions.Name1: %s\n", sm.StructMapOptions.Name)
+ sm.StructMapOptions.Name = sm.Start.EndPointPath().Copy()
+ sm.PrintDebug("DEBUG: sm.StructMapOptions.Name2: %s\n", sm.StructMapOptions.Name)
+ break
+ }
+
+ if sm.Start == nil {
+ ok = Child.IsKnown()
+ break // Wait until we've started.
+ }
+
+ // IsUnexported - will add to map only if sm.AddEmpty == true
+ ok = sm.IsUnexported(Child)
+ if ok {
+ break
+ }
+
+ // IsNil - will add to map only if sm.AddEmpty == true
+ ok = sm.IsNil(Child)
+ if ok {
+ break
+ }
+
+ // IsEmpty - will add to map only if sm.AddEmpty == true
+ ok = sm.IsEmpty(Child)
+ if ok {
+ break
+ }
+
+ // IsPointArrayFlatten -
+ ok = sm.IsPointArrayFlatten(Child)
+ if ok {
+ // Will flatten a type - don't need to parse children.
+ ok = true
+ break
+ }
+
+ // IsPointSplitOn -
+ ok = sm.IsPointSplitOn(Child)
+ if ok {
+ // Will split a type - don't need to parse children as it only applies to known types.
+ break
+ }
+
+ // IsTable -
+ ok = sm.IsTable(Child)
+ if ok {
+ // Never exit with true, but break - we still want to parse the children.
+ break
+ }
+
+ // This will add any type that we know about
+ // Basically all valueTypes and builtins, except those we want to parse - map, array, slice or struct.
+ ok = Child.IsKnown()
+ if ok {
+ sm.Add(Child)
+ break
+ }
+ }
+
+ return ok
+}
+
+func (sm *StructMap) Add(Current *Reflect) {
+ for range Only.Once {
+ if Current.IsGoStruct() {
+ break
+ }
+
+ if sm.StructMapOptions.StartAt != "" {
+ sm.PrintDebug("# Add(STILL SEARCHING): %s\n", Current)
+ break
+ }
+
+ if sm.Map == nil {
+ sm.Map = make(map[string]*Reflect)
+ }
+ name := Current.EndPointPath().String()
+ sm.Map[name] = Current
+ sm.PrintDebug("\t- Add() Current: %s\n", Current)
+ }
+}
+
+func (sm *StructMap) AddTable(Current *Reflect) {
+ for range Only.Once {
+ if Current.IsGoStruct() {
+ break
+ }
+
+ if sm.StructMapOptions.StartAt != "" {
+ sm.PrintDebug("# Add(STILL SEARCHING): %s\n", Current)
+ break
+ }
+
+ if sm.TableMap == nil {
+ sm.TableMap = make(map[string]*Reflect)
+ }
+ name := Current.Name()
+ sm.TableMap[name] = Current
+ sm.PrintDebug("\t- Add() Current: %s\n", Current)
+ }
+}
+
+func (sm *StructMap) IsNil(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ yes = Current.PointIgnoreChildIfFromNil() // true - Current is nil.
+
+ if sm.AddNil {
+ sm.Add(Current)
+ _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is nil: %s\n", Current)
+ break
+ }
+ }
+ return yes
+}
+
+func (sm *StructMap) IsEmpty(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ if Current.Length == valueTypes.IgnoreLength {
+ break
+ }
+
+ if Current.Length > 0 {
+ break
+ }
+
+ if Current.IsPointIgnoreZero() {
+ break
+ }
+
+ yes = true
+ if sm.AddEmpty {
+ sm.Add(Current)
+ _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is nil: %s\n", Current)
+ break
+ }
+ }
+ return yes
+}
+
+func (sm *StructMap) IsUnexported(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ if Current.IsExported {
+ break
+ }
+
+ yes = true
+ if sm.AddUnexported {
+ sm.Add(Current)
+ _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is not exported: %s\n", Current)
+ }
+ }
+ return yes
+}
+
+func (sm *StructMap) IsUnsupported(Current *Reflect) {
+ for range Only.Once {
+ if !sm.AddUnsupported {
+ break
+ }
+ sm.Add(Current)
+ _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is unsupported: %s\n", Current)
+ }
+}
+
+func (sm *StructMap) IsInvalid(Current *Reflect) {
+ for range Only.Once {
+ if !sm.AddInvalid {
+ break
+ }
+ sm.Add(Current)
+ _, _ = fmt.Fprintf(os.Stderr,"WARNING: Field type is invalid: %s\n", Current)
+ }
+}
+
+func (sm *StructMap) IsTable(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ // Primary table type, gets added to main map, but not table map.
+ if Current.IsTable() {
+ // fmt.Printf("Current[%s] - Current.IsTable\n", Current.FieldPath)
+ if Current.DataStructure.PointUnit == "" {
+ Current.DataStructure.PointUnit = "--"
+ }
+ if Current.DataStructure.PointValueType == "" {
+ Current.DataStructure.PointValueType = "Table"
+ }
+ if Current.DataStructure.ValueType == "" {
+ Current.DataStructure.ValueType = "Table"
+ }
+ if Current.DataStructure.PointGroupName == "" {
+ Current.DataStructure.PointGroupName = Current.FieldName
+ }
+ // if Current.DataStructure.PointName != "" {
+ // Current.DataStructure.PointName = Current.FieldName + " " + Current.DataStructure.PointName
+ // }
+
+ // @TODO - Consider standardizing points to a known format.
+ // queryUserCurveTemplateData is a good example of the structure.
+
+ sm.PrintDebug("\t- IsTable(): %s\n", Current)
+ sm.AddTable(Current)
+ yes = Current.IsKnown()
+
+ // We want to flatten a slice down to EG "[1, 2, 3]"
+ uv := valueTypes.AnyToValueString(Current.InterfaceValue, 0, Current.DataStructure.PointNameDateFormat)
+ // uv = Current.AsJson()
+ Current.Value.Set(valueTypes.SetUnitValueString(uv, Current.DataStructure.PointUnit, Current.DataStructure.PointValueType))
+ sm.Add(Current)
+ break
+ }
+
+ // Check for a table child.
+ ok, iterate := Current.IsTableChild()
+ if !ok {
+ break
+ }
+ // fmt.Printf("Current[%s] IsTableChild - iterate:%d kind:%s\n", Current.FieldPath, iterate, Current.Kind.String())
+
+ // @TODO - Should we instead, recurse back up the parent tree to ensure we aren't a member of another table?
+ sm.PrintDebug("\t- IsTable() Child: %s\n", Current)
+ Current.DataStructure.DataTableChild = true
+ if Current.DataStructure.PointUnit == "" {
+ Current.DataStructure.PointUnit = "--"
+ }
+ if Current.DataStructure.PointValueType == "" {
+ Current.DataStructure.PointValueType = "Table"
+ }
+ if Current.DataStructure.ValueType == "" {
+ Current.DataStructure.ValueType = "Table"
+ }
+ if Current.DataStructure.PointGroupName == "" {
+ Current.DataStructure.PointGroupName = Current.CurrentReflect.DataStructure.PointGroupName
+ }
+
+ // We want to flatten a slice down to EG "[1, 2, 3]"
+ yes = Current.IsKnown()
+ // First order types get flattened.
+ switch Current.Kind {
+ case reflect.Struct:
+ if yes {
+ break
+ }
+ if iterate == 1 {
+ sm.Add(Current)
+ break
+ }
+
+ case reflect.Array:
+ fallthrough
+ case reflect.Slice:
+ if yes {
+ break
+ }
+ if iterate == 1 {
+ if Current.Length <= 1 {
+ uv := valueTypes.AnyToValueString(Current.InterfaceValue, 0, Current.DataStructure.PointNameDateFormat)
+ Current.Value.Set(valueTypes.SetUnitValueString(uv, Current.DataStructure.PointUnit, Current.DataStructure.PointValueType))
+ }
+ sm.Add(Current)
+ break
+ }
+
+ case reflect.Map:
+ if yes {
+ break
+ }
+ if iterate == 1 {
+ if Current.Length <= 1 {
+ uv := valueTypes.AnyToValueString(Current.InterfaceValue, 0, Current.DataStructure.PointNameDateFormat)
+ Current.Value.Set(valueTypes.SetUnitValueString(uv, Current.DataStructure.PointUnit, Current.DataStructure.PointValueType)) }
+ sm.Add(Current)
+ break
+ }
+ }
+ }
+ return yes
+}
+
+func (sm *StructMap) IsPointArrayFlatten(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ for range Only.Once {
+ if Current.IsPointArrayFlatten() {
+ yes = true
+ break
+ }
+
+ yes = false
+ }
+ if !yes {
+ break
+ }
+ sm.PrintDebug("\t- PointArrayFlatten() Child: %s\n", Current)
+
+ // // @TODO - Here we need to convert the type to json, but it's not that simple.
+ // // We need to scan the structure and resolve some of the tags.
+ // // Maybe we do this in the table scanner...
+ // var tp DataStructures
+ // tp.Debug = false
+ // tp.ShowEmpty = false
+ // tp.GetPointTags(Parent, Current, EndPointPath{})
+ //
+ // fmt.Printf("TP: %v\n", tp)
+ // uv := valueTypes.AnyToValueString(tp, 0, Current.DataStructure.PointNameDateFormat)
+
+ // We want to flatten a slice down to EG "[1, 2, 3]"
+ if Current.DataStructure.PointUnit == "" {
+ Current.DataStructure.PointUnit = "--"
+ }
+ if Current.DataStructure.PointValueType == "" {
+ Current.DataStructure.PointValueType = "--"
+ }
+ if Current.DataStructure.ValueType == "" {
+ Current.DataStructure.ValueType = "--"
+ }
+ if Current.DataStructure.PointGroupName == "" {
+ Current.DataStructure.PointGroupName = Current.FieldName
+ }
+ // if Current.DataStructure.PointName != "" {
+ // Current.DataStructure.PointName = Current.FieldName + " " + Current.DataStructure.PointName
+ // }
+
+ // @TODO - Consider providing a "collapse" of an array/slice/map where:
+ // the array elements end up becoming elements within a UV array.
+
+ // Current.Value, Current.IsNil, Current.IsOk = valueTypes.AnyToUnitValue(
+ // Current.InterfaceValue, Current.DataStructure.PointUnit,
+ // Current.DataStructure.PointValueType, Current.DataStructure.PointNameDateFormat)
+ uv := valueTypes.AnyToValueString(Current.InterfaceValue, 0, Current.DataStructure.PointNameDateFormat)
+ Current.Value.Set(valueTypes.SetUnitValueString(uv, Current.DataStructure.PointUnit, Current.DataStructure.PointValueType))
+ sm.Add(Current)
+ }
+ return yes
+}
+
+func (sm *StructMap) IsPointSplitOn(Current *Reflect) bool {
+ var yes bool
+ for range Only.Once {
+ if Current.DataStructure.PointSplitOn == "" {
+ break
+ }
+ sm.PrintDebug("\t- PointSplitOn() Child: %s\n", Current)
+
+ // We want to split a string into separate points - currently only handles string types.
+ // @TODO - Fix this up! - Use PointSplitType to define a particular type.
+ soSplit := strings.Split(Current.Value.First().String(), Current.DataStructure.PointSplitOn)
+ Current.SetValue(soSplit)
+ for soI, soV := range soSplit {
+ Child := Current.Copy()
+ if Child.DataStructure.PointValueReplace != "" {
+ soV = strings.ReplaceAll(soV, Child.DataStructure.PointValueReplace, Child.DataStructure.PointValueReplaceWith)
+ }
+ Child.SetValue(soV)
+ Child.EndPointPath().Append(valueTypes.PrintInt(2, soI))
+ if Child.DataStructure.PointUnit == "" {
+ Child.DataStructure.PointUnit = "--"
+ }
+ if Child.DataStructure.PointValueType == "" {
+ Child.DataStructure.PointValueType = "Split"
+ }
+ if Current.DataStructure.ValueType == "" {
+ Current.DataStructure.ValueType = "Split"
+ }
+ if Child.DataStructure.PointGroupName == "" {
+ Child.DataStructure.PointGroupName = Child.FieldName
+ }
+ // if Child.DataStructure.PointName != "" {
+ // Child.DataStructure.PointName = Child.FieldName + " " + Child.DataStructure.PointName
+ // }
+ sm.Add(&Child)
+ }
+ yes = true
+ }
+ return yes
+}
+
+
+func (sm *StructMap) GetTables() StructTables {
+ var ret StructTables
+
+ for range Only.Once {
+ st := sm.GetResultTableData()
+ ret = append(ret, st)
+
+ names := sm.GetTableNames()
+ for _, name := range names {
+ st = sm.GetTableData(name)
+ if !st.IsValid {
+ continue
+ }
+ ret = append(ret, st)
+ }
+
+ }
+
+ return ret
+}
+
+func (sm *StructMap) GetTableNames() []string {
+ var ret []string
+
+ for range Only.Once {
+ for name := range sm.TableMap {
+ ret = append(ret, name)
+ }
+ }
+
+ return ret
+}
+
+func (sm *StructMap) GetTableData(name string) StructTable {
+ var ret StructTable
+
+ for range Only.Once {
+ var ok bool
+ if ret.Current, ok = sm.TableMap[name]; !ok {
+ break
+ }
+
+ ret.Name = ret.Current.Name()
+ ret.IsValid = true
+
+ rows, cols := ret.Current.CountChildren()
+ // fmt.Printf("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, rows, cols)
+ sm.PrintDebug("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, rows, cols)
+ if ret.Current.IsPointIgnore() {
+ break
+ }
+
+ for row, Child := range ret.Current.ChildReflect {
+ // fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d\n", Child.FieldPath, ret.Current.Kind,
+ // Child.IsKnown(),
+ // len(ret.Current.ChildReflect),
+ // len(Child.ChildReflect))
+ sm.PrintDebug("GetTableData() row[%d]: %s\n", row, Child)
+ if Child.IsPointIgnore() {
+ continue
+ }
+
+ var refs []*Reflect
+
+ for col, ChildStruct := range Child.ChildReflect {
+ // fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d / ChildStruct:%d\n", ChildStruct.FieldPath, ret.Current.Kind,
+ // ChildStruct.IsKnown(),
+ // len(ret.Current.ChildReflect),
+ // len(Child.ChildReflect),
+ // len(ChildStruct.ChildReflect))
+ sm.PrintDebug("GetTableData() cell[%d][%d]: %s\n", row, col, Child)
+ if ChildStruct.IsPointIgnore() {
+ continue
+ }
+
+ // Make sure we have a valid sort column name.
+ if ret.Current.DataStructure.DataTableSortOn != "" {
+ if ret.Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+ ret.SortOn = ChildStruct.DataStructure.PointName
+ }
+ }
+
+ if ChildStruct.IsKnown() {
+ refs = append(refs, ChildStruct)
+ continue
+ }
+ refs = append(refs, ChildStruct)
+ }
+
+ if len(refs) > 0 {
+ ret.AddRow(refs...)
+ }
+ }
+ }
+
+ return ret
+}
+
+func (sm *StructMap) GetResultTableData() StructTable {
+ var ret StructTable
+
+ for range Only.Once {
+ fmt.Printf("NOT IMPLEMENTED YET.\n")
+ break
+ var sorted []string
+ // @TODO - Add in other column sorting options here.
+ for name := range sm.Map {
+ sorted = append(sorted, name)
+ }
+
+ ret.Name = "Results"
+ ret.IsValid = true
+
+ for _, name := range sorted {
+ Current := sm.Map[name]
+
+ rows, cols := Current.CountChildren()
+ // fmt.Printf("GetTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, ret.Current.FieldPath, ret.Current.Kind, rows, cols)
+ sm.PrintDebug("GetResultTableData(%s) - path:%s type:%s rows:%d cols:%d\n", name, Current.FieldPath, Current.Kind, rows, cols)
+ if Current.IsPointIgnore() {
+ break
+ }
+
+ // if len(refs) > 0 {
+ // ret.AddRow(refs...)
+ // }
+
+ // for row, Child := range Current.ChildReflect {
+ // fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d\n", Child.FieldPath, ret.Current.Kind,
+ // Child.IsKnown(),
+ // len(ret.Current.ChildReflect),
+ // len(Child.ChildReflect))
+ // if sm.Debug {
+ // _, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() row[%d]: %s\n", row, Child)
+ // }
+ // if Child.IsPointIgnore() {
+ // continue
+ // }
+ //
+ // var refs []*Reflect
+ //
+ // for col, ChildStruct := range Child.ChildReflect {
+ // // fmt.Printf("[%s]%s - Known:%t Current:%d / Child:%d / ChildStruct:%d\n", ChildStruct.FieldPath, ret.Current.Kind,
+ // // ChildStruct.IsKnown(),
+ // // len(ret.Current.ChildReflect),
+ // // len(Child.ChildReflect),
+ // // len(ChildStruct.ChildReflect))
+ // if sm.Debug {
+ // _, _ = fmt.Fprintf(os.Stderr, "GetResultTableData() cell[%d][%d]: %s\n", row, col, Child)
+ // }
+ // if ChildStruct.IsPointIgnore() {
+ // continue
+ // }
+ //
+ // // Make sure we have a valid sort column name.
+ // if Current.DataStructure.DataTableSortOn != "" {
+ // if Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+ // ret.SortOn = ChildStruct.DataStructure.PointName
+ // }
+ // }
+ //
+ // if ChildStruct.IsKnown() {
+ // refs = append(refs, ChildStruct)
+ // continue
+ // }
+ // refs = append(refs, ChildStruct)
+ // }
+ //
+ // if len(refs) > 0 {
+ // ret.AddRow(refs...)
+ // }
+ }
+ }
+
+ return ret
+}
+
+
+type StructTable struct {
+ Name string
+ Current *Reflect
+ Headers []string
+ Reflects [][]*Reflect
+ SortOn string
+ IsValid bool
+}
+type StructTables []StructTable
+type StructValues [][]valueTypes.UnitValue
+
+func (ta *StructTable) AddHeader(headers ...*Reflect) {
+ for range Only.Once {
+ for _, header := range headers {
+ name := valueTypes.PointToName(header.DataStructure.PointId)
+ switch header.Value.Unit() { // header.DataStructure.PointUnit {
+ case "--":
+ //
+ case "":
+ //
+
+ default:
+ // name += " (" + header.DataStructure.PointUnit + ")"
+ name += " (" + header.Value.Unit() + ")"
+ }
+ ta.Headers = append(ta.Headers, name)
+ }
+ }
+}
+
+func (ta *StructTable) AddRow(refs ...*Reflect) {
+ for range Only.Once {
+ if ta.Reflects == nil {
+ ta.Reflects = make([][]*Reflect, 0)
+ }
+ if ta.Headers == nil {
+ ta.AddHeader(refs...)
+ }
+
+ var row []*Reflect
+ row = append(row, refs...)
+ ta.Reflects = append(ta.Reflects, row)
+ }
+}
+
+func (ta *StructTable) GetRow(row int) []*Reflect {
+ if row >= len(ta.Reflects) {
+ return []*Reflect{}
+ }
+ return ta.Reflects[row]
+}
+
+func (ta *StructTable) GetHeaders() []string {
+ return ta.Headers
+}
+
+func (ta *StructTable) Get() [][]*Reflect {
+ return ta.Reflects
+}
+
+func (ta *StructTable) GetValues() StructValues {
+ ret := make(StructValues, 0)
+
+ for range Only.Once {
+ if !ta.IsValid {
+ break
+ }
+
+ for rowIndex := range ta.Reflects {
+ // fmt.Printf("ROW[%d] - size:%d\n", rowIndex, len(ta.Reflects[rowIndex]))
+ var data []valueTypes.UnitValue
+
+ // size := len(ta.Reflects[rowIndex])
+ // if size == 1 {
+ // Current := ta.Reflects[rowIndex][0]
+ // for _, value := range Current.Value {
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Date"
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Point Id"
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Value"
+ // data = append(data, valueTypes.UnitValue{StringValue: value.Unit()}) // "Unit"
+ // data = append(data, valueTypes.UnitValue{StringValue: value.TypeValue}) // "Unit Type"
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Group Name"
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Description"
+ // data = append(data, valueTypes.UnitValue{StringValue: ""}) // "Update Freq"
+ // ret = append(ret, data)
+ // }
+ // continue
+ // }
+
+ for colIndex, col := range ta.Reflects[rowIndex] {
+ value := ta.Reflects[rowIndex][colIndex].Value
+
+ if col.IsUnknown() {
+ dateFormat := col.DataStructure.PointNameDateFormat
+ if dateFormat == "" {
+ dateFormat = valueTypes.DateTimeLayout
+ }
+ // fmt.Printf("\tCOL[%d][%d] - FieldPath:%s - Value(old):%v\n", rowIndex, colIndex,
+ // ta.Reflects[rowIndex][colIndex].FieldPath, value)
+ value, _, _ = valueTypes.AnyToUnitValue(col.Value, col.DataStructure.PointUnit,
+ col.DataStructure.PointValueType, dateFormat)
+ }
+
+ for _, v := range value {
+ // fmt.Printf("\tCOL[%d][%d] (+%d) - FieldPath:%s - Value:%v - IsKnown:%t\n", rowIndex, colIndex, i,
+ // ta.Reflects[rowIndex][colIndex].FieldPath, value, col.IsKnown())
+ data = append(data, v)
+ }
+ }
+ // fmt.Printf("\tROW[%d] data:%d\n", rowIndex, len(data))
+ ret = append(ret, data)
+ }
+ }
+
+ return ret
+}
+
+
+// func (sm *StructMap) GetMergedTableData(name string) StructTable {
+// var ret StructTable
+//
+// for range Only.Once {
+// var ok bool
+// if ret.Current, ok = sm.TableMap[name]; !ok {
+// break
+// }
+//
+// ret.Name = ret.Current.Name()
+// ret.IsValid = true
+//
+// if ret.Current.Kind == reflect.Struct {
+// if sm.Debug {
+// _, _ = fmt.Fprintf(os.Stderr,"GetTableArray(%s) - STRUCT\n", name)
+// }
+//
+// if ret.Current.IsPointIgnore() {
+// continue
+// }
+//
+// fmt.Printf("[%s]STRUCT - Current:%d\n", ret.Current.FieldPath,
+// len(ret.Current.ChildReflect),
+// )
+//
+// var refs []*Reflect
+// for _, Child := range ret.Current.ChildReflect {
+// if Child.IsPointIgnore() {
+// continue
+// }
+//
+// if ret.Current.DataStructure.DataTableSortOn != "" {
+// // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
+// if ret.Current.DataStructure.DataTableSortOn == Child.FieldName {
+// ret.SortOn = Child.DataStructure.PointName
+// // dt.Reflect.DataStructure.DataTableSortOn = ""
+// }
+// }
+//
+// fmt.Printf("[%s]STRUCT - Known:%t Current:%d / Child:%d\n", Child.FieldPath,
+// Child.IsKnown(),
+// len(ret.Current.ChildReflect),
+// len(Child.ChildReflect),
+// )
+// if Child.IsKnown() {
+// refs = append(refs, Child)
+// continue
+// }
+//
+// refs = append(refs, Child)
+// }
+//
+// if len(refs) > 0 {
+// ret.AddRow(refs...)
+// }
+// break
+// }
+//
+// if ret.Current.Kind == reflect.Map {
+// if sm.Debug {
+// _, _ = fmt.Fprintf(os.Stderr,"GetTableArray(%s) - MAP\n", name)
+// }
+//
+// if ret.Current.IsPointIgnore() {
+// continue
+// }
+//
+// fmt.Printf("[%s]STRUCT - Current:%d\n", ret.Current.FieldPath,
+// len(ret.Current.ChildReflect),
+// )
+//
+// var refs []*Reflect
+// for _, Child := range ret.Current.ChildReflect {
+// if Child.IsPointIgnore() {
+// continue
+// }
+//
+// if ret.Current.DataStructure.DataTableSortOn != "" {
+// // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
+// if ret.Current.DataStructure.DataTableSortOn == Child.FieldName {
+// ret.SortOn = Child.DataStructure.PointName
+// // dt.Reflect.DataStructure.DataTableSortOn = ""
+// }
+// }
+//
+// fmt.Printf("[%s]STRUCT - Known:%t Current:%d / Child:%d\n", Child.FieldPath,
+// Child.IsKnown(),
+// len(ret.Current.ChildReflect),
+// len(Child.ChildReflect),
+// )
+// if Child.IsKnown() {
+// refs = append(refs, Child)
+// continue
+// }
+// refs = append(refs, Child)
+// }
+//
+// if len(refs) > 0 {
+// ret.AddRow(refs...)
+// }
+// break
+// }
+//
+// _, _ = fmt.Fprintf(os.Stderr,"GetTableArray(%s) - ARRAY\n", name)
+// for row, Child := range ret.Current.ChildReflect {
+// if sm.Debug {
+// _, _ = fmt.Fprintf(os.Stderr,"GetTableArray() Child[%d]: %s\n", row, Child)
+// }
+// if Child.IsPointIgnore() {
+// continue
+// }
+//
+// fmt.Printf("[%s]SLICE - Current:%d / Child:%d\n", Child.FieldPath,
+// len(ret.Current.ChildReflect),
+// len(Child.ChildReflect),
+// )
+//
+// var refs []*Reflect
+// for _, ChildStruct := range Child.ChildReflect {
+// if ChildStruct.IsPointIgnore() {
+// continue
+// }
+//
+// if ret.Current.DataStructure.DataTableSortOn != "" {
+// // fmt.Printf("\tChildStruct> %s / %s\n", ChildStruct.FieldName, dt.Reflect.DataStructure.DataTableSortOn)
+// if ret.Current.DataStructure.DataTableSortOn == ChildStruct.FieldName {
+// ret.SortOn = ChildStruct.DataStructure.PointName
+// // dt.Reflect.DataStructure.DataTableSortOn = ""
+// }
+// }
+//
+// fmt.Printf("[%s]STRUCT - Known:%t Current:%d / Child:%d / ChildStruct:%d\n", Child.FieldPath,
+// Child.IsKnown(),
+// len(ret.Current.ChildReflect),
+// len(Child.ChildReflect),
+// len(ChildStruct.ChildReflect),
+// )
+// if ChildStruct.IsKnown() {
+// refs = append(refs, ChildStruct)
+// continue
+// }
+//
+// refs = append(refs, ChildStruct)
+// }
+//
+// if len(refs) > 0 {
+// ret.AddRow(refs...)
+// }
+// break
+// }
+// }
+//
+// return ret
+// }
+
+// func (sm *StructMap) SaveGoStructOptions(Child *Reflect) bool {
+// var yes bool
+//
+// for range Only.Once {
+// var ds DataTags
+// ds = Child.DataStructure
+// ds.Json = ""
+// ds.PointId = ""
+// ds.PointName = ""
+// ds.ValueType = ""
+// ds.ValueKind = ""
+// ds.Endpoint.Clear()
+//
+// sm.GoStructOptions = &ds
+// sm.GoStructOptionCurrent = Child.CurrentReflect.CurrentReflect // @TODO - Need to sort out this mess.
+// if Child.IsTable() {
+// sm.GoStructOptionCurrent = Child.CurrentReflect.CurrentReflect
+// }
+// Child.CurrentReflect.CurrentReflect.GoStruct = &ds
+// }
+//
+// return yes
+// }
+//
+// func (sm *StructMap) ClearGoStructOptions() {
+// sm.GoStructOptions = nil
+// sm.GoStructOptionCurrent = nil
+// }
diff --git a/iSolarCloud/api/GoStruct/valueTypes/bool.go b/iSolarCloud/api/GoStruct/valueTypes/bool.go
index 167c298b3..fb9a30a70 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/bool.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/bool.go
@@ -7,6 +7,9 @@ import (
)
+var VarTrue = true
+var VarFalse = false
+
type Bool struct {
string `json:"string,omitempty"`
bool `json:"bool,omitempty"`
diff --git a/iSolarCloud/api/GoStruct/valueTypes/const.go b/iSolarCloud/api/GoStruct/valueTypes/const.go
new file mode 100644
index 000000000..7675176ee
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/valueTypes/const.go
@@ -0,0 +1,5 @@
+package valueTypes
+
+const (
+ IgnoreLength = -1
+)
diff --git a/iSolarCloud/api/GoStruct/valueTypes/point.go b/iSolarCloud/api/GoStruct/valueTypes/point.go
index 3583fa946..cf8cc200b 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/point.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/point.go
@@ -22,17 +22,279 @@ import (
// Statistics valueTypes.String `json:"statistics"`
// Style valueTypes.String `json:"style"`
// Unit valueTypes.String `json:"unit"`
-// DataList []struct {
-// TimeStamp valueTypes.String `json:"time_stamp"`
-// Value valueTypes.String `json:"value"`
-// } `json:"data_list" PointArrayFlatten:"false"`
// }
+type PsKey struct {
+ string `json:"string,omitempty"`
+
+ deviceType string `json:"device_type,omitempty"`
+ psId string `json:"ps_id,omitempty"`
+
+ Valid bool `json:"valid"`
+ Error error `json:"-"`
+}
+
+// UnmarshalJSON - Convert JSON to value
+func (t *PsKey) UnmarshalJSON(data []byte) error {
+
+ for range Only.Once {
+ t.Valid = false
+
+ if len(data) == 0 {
+ break
+ }
+
+ // Store result from string
+ t.Error = json.Unmarshal(data, &t.string)
+ if t.Error != nil {
+ break
+ }
+ t.SetValue(t.string)
+ }
+
+ return t.Error
+}
+
+// MarshalJSON - Convert value to JSON
+func (t PsKey) MarshalJSON() ([]byte, error) {
+ var data []byte
+
+ for range Only.Once {
+ t.Valid = false
+
+ data, t.Error = json.Marshal(t.string)
+ if t.Error != nil {
+ break
+ }
+ t.Valid = true
+ }
+
+ return data, t.Error
+}
+
+func (t *PsKey) Value() string {
+ return t.string
+}
+
+func (t PsKey) String() string {
+ return t.string
+}
+
+func (t *PsKey) Match(comp string) bool {
+ if t.string == comp {
+ return true
+ }
+ return false
+}
+
+func (t *PsKey) PsKey() string {
+ return t.string
+}
+
+func (t *PsKey) SetValue(value string) PsKey {
+ for range Only.Once {
+ t.string = value
+ t.deviceType = ""
+ t.psId = ""
+ t.Valid = true
+
+ s := strings.Split(value, "_")
+ switch {
+ case len(s) == 1:
+ t.psId = s[0]
+ case len(s) >= 2:
+ t.psId = s[0]
+ t.deviceType = s[1]
+ }
+ }
+
+ return *t
+}
+
+func (t *PsKey) GetDeviceType() string {
+ return t.deviceType
+}
+
+func (t *PsKey) GetPsId() string {
+ return t.psId
+}
+
+func SetPsKeyValue(value string) PsKey {
+ var t PsKey
+ return t.SetValue(value)
+}
+
+
+type PsId struct {
+ string `json:"string,omitempty"`
+ int64 `json:"integer,omitempty"`
+ Valid bool `json:"valid"`
+ Error error `json:"-"`
+}
+
+// UnmarshalJSON - Convert JSON to value
+func (t *PsId) UnmarshalJSON(data []byte) error {
+ for range Only.Once {
+ t.Valid = false
+
+ if len(data) == 0 {
+ break
+ }
+
+ // Store result from int
+ t.Error = json.Unmarshal(data, &t.int64)
+ if t.Error == nil {
+ t.SetValue(t.int64)
+ break
+ }
+
+ // Store result from string
+ t.Error = json.Unmarshal(data, &t.string)
+ if t.Error == nil {
+ t.SetString(t.string)
+ break
+ }
+
+ t.SetString(string(data))
+ }
+
+ return t.Error
+}
+
+// MarshalJSON - Convert value to JSON
+func (t PsId) MarshalJSON() ([]byte, error) {
+ var data []byte
+ for range Only.Once {
+ t.Valid = false
+
+ data, t.Error = json.Marshal(t.int64)
+ if t.Error != nil {
+ break
+ }
+ t.Valid = true
+ // t.string = strconv.FormatInt(t.int64, 10)
+ }
+
+ return data, t.Error
+}
+
+func (t PsId) Value() int64 {
+ return t.int64
+}
+
+func (t PsId) String() string {
+ return t.string
+}
+
+func (t PsId) Match(comp int64) bool {
+ if t.int64 == comp {
+ return true
+ }
+ return false
+}
+
+func (t *PsId) SetString(value string) PsId {
+ for range Only.Once {
+ t.string = value
+ t.int64 = 0
+ t.Valid = false
+
+ if value == "" {
+ break
+ }
+
+ if value == "--" {
+ // value = ""
+ break
+ }
+
+ var v int
+ v, t.Error = strconv.Atoi(t.string)
+ if t.Error != nil {
+ break
+ }
+ t.int64 = int64(v)
+ t.Valid = true
+ }
+
+ return *t
+}
+
+func (t *PsId) SetValue(value int64) PsId {
+ for range Only.Once {
+ t.string = ""
+ t.int64 = value
+ t.Valid = true
+ t.string = strconv.FormatInt(t.int64, 10)
+ }
+
+ return *t
+}
+
+
+func SetPsIdString(value string) PsId {
+ var t PsId
+ return t.SetString(value)
+}
+
+func SetPsIdValue(value int64) PsId {
+ var t PsId
+ return t.SetValue(value)
+}
+
+func SetPsIdStrings(values []string) PsIds {
+ var t PsIds
+ for range Only.Once {
+ // sgd.PsId = valueTypes.SetPsIdString(psId)
+ for _, psId := range values {
+ if psId == "" {
+ continue
+ }
+ t = append(t, SetPsIdString(psId))
+ }
+ }
+ return t
+}
+
+func SetPsIdValues(values []int64) PsIds {
+ var t PsIds
+ for range Only.Once {
+ // sgd.PsId = valueTypes.SetPsIdString(psId)
+ for _, psId := range values {
+ if psId == 0 {
+ continue
+ }
+ t = append(t, SetPsIdValue(psId))
+ }
+ }
+ return t
+}
+
+
+type PsIds []PsId
+
+func (t *PsIds) Strings() []string {
+ var ret []string
+ for range Only.Once {
+ // sgd.PsId = valueTypes.SetPsIdString(psId)
+ for _, psId := range *t {
+ ret = append(ret, psId.String())
+ }
+ }
+ return ret
+}
+
+
type PointId struct {
string `json:"string,omitempty"`
int64 `json:"integer,omitempty"`
isInt bool
+
+ // PointName String `json:"point_name"`
+ // PsId String `json:"ps_id"`
+ // PsKey String `json:"ps_key"`
+
Valid bool `json:"valid"`
Error error `json:"-"`
}
diff --git a/iSolarCloud/api/GoStruct/valueTypes/ps_id.go b/iSolarCloud/api/GoStruct/valueTypes/ps_id.go
index 45127385d..9c16fec05 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/ps_id.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/ps_id.go
@@ -1,167 +1 @@
package valueTypes
-
-import (
- "encoding/json"
- "github.com/MickMake/GoUnify/Only"
- "strconv"
-)
-
-
-type PsId struct {
- string `json:"string,omitempty"`
- int64 `json:"integer,omitempty"`
- Valid bool `json:"valid"`
- Error error `json:"-"`
-}
-
-// UnmarshalJSON - Convert JSON to value
-func (t *PsId) UnmarshalJSON(data []byte) error {
- for range Only.Once {
- t.Valid = false
-
- if len(data) == 0 {
- break
- }
-
- // Store result from int
- t.Error = json.Unmarshal(data, &t.int64)
- if t.Error == nil {
- t.SetValue(t.int64)
- break
- }
-
- // Store result from string
- t.Error = json.Unmarshal(data, &t.string)
- if t.Error == nil {
- t.SetString(t.string)
- break
- }
-
- t.SetString(string(data))
- }
-
- return t.Error
-}
-
-// MarshalJSON - Convert value to JSON
-func (t PsId) MarshalJSON() ([]byte, error) {
- var data []byte
- for range Only.Once {
- t.Valid = false
-
- data, t.Error = json.Marshal(t.int64)
- if t.Error != nil {
- break
- }
- t.Valid = true
- // t.string = strconv.FormatInt(t.int64, 10)
- }
-
- return data, t.Error
-}
-
-func (t PsId) Value() int64 {
- return t.int64
-}
-
-func (t PsId) String() string {
- return t.string
-}
-
-func (t PsId) Match(comp int64) bool {
- if t.int64 == comp {
- return true
- }
- return false
-}
-
-func (t *PsId) SetString(value string) PsId {
- for range Only.Once {
- t.string = value
- t.int64 = 0
- t.Valid = false
-
- if value == "" {
- break
- }
-
- if value == "--" {
- // value = ""
- break
- }
-
- var v int
- v, t.Error = strconv.Atoi(t.string)
- if t.Error != nil {
- break
- }
- t.int64 = int64(v)
- t.Valid = true
- }
-
- return *t
-}
-
-func (t *PsId) SetValue(value int64) PsId {
- for range Only.Once {
- t.string = ""
- t.int64 = value
- t.Valid = true
- t.string = strconv.FormatInt(t.int64, 10)
- }
-
- return *t
-}
-
-
-func SetPsIdString(value string) PsId {
- var t PsId
- return t.SetString(value)
-}
-
-func SetPsIdValue(value int64) PsId {
- var t PsId
- return t.SetValue(value)
-}
-
-func SetPsIdStrings(values []string) PsIds {
- var t PsIds
- for range Only.Once {
- // sgd.PsId = valueTypes.SetPsIdString(psId)
- for _, psId := range values {
- if psId == "" {
- continue
- }
- t = append(t, SetPsIdString(psId))
- }
- }
- return t
-}
-
-func SetPsIdValues(values []int64) PsIds {
- var t PsIds
- for range Only.Once {
- // sgd.PsId = valueTypes.SetPsIdString(psId)
- for _, psId := range values {
- if psId == 0 {
- continue
- }
- t = append(t, SetPsIdValue(psId))
- }
- }
- return t
-}
-
-
-type PsIds []PsId
-
-func (t *PsIds) Strings() []string {
- var ret []string
- for range Only.Once {
- // sgd.PsId = valueTypes.SetPsIdString(psId)
- for _, psId := range *t {
- ret = append(ret, psId.String())
- }
- }
- return ret
-}
diff --git a/iSolarCloud/api/GoStruct/valueTypes/string.go b/iSolarCloud/api/GoStruct/valueTypes/string.go
index 8b56f9955..39143861b 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/string.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/string.go
@@ -87,90 +87,3 @@ func SetStringValue(value string) String {
var t String
return t.SetValue(value)
}
-
-
-type PsKey struct {
- string `json:"string,omitempty"`
- Valid bool `json:"valid"`
- Error error `json:"-"`
-}
-
-// UnmarshalJSON - Convert JSON to value
-func (t *PsKey) UnmarshalJSON(data []byte) error {
-
- for range Only.Once {
- t.Valid = false
-
- if len(data) == 0 {
- break
- }
-
- // Store result from string
- t.Error = json.Unmarshal(data, &t.string)
- if t.Error != nil {
- break
- }
- t.SetPsKey(t.string)
- }
-
- return t.Error
-}
-
-// MarshalJSON - Convert value to JSON
-func (t PsKey) MarshalJSON() ([]byte, error) {
- var data []byte
-
- for range Only.Once {
- t.Valid = false
-
- data, t.Error = json.Marshal(t.string)
- if t.Error != nil {
- break
- }
- t.Valid = true
- }
-
- return data, t.Error
-}
-
-func (t PsKey) Value() string {
- return t.string
-}
-
-func (t PsKey) String() string {
- return t.string
-}
-
-func (t PsKey) Match(comp string) bool {
- if t.string == comp {
- return true
- }
- return false
-}
-
-func (t PsKey) PsKey() string {
- return t.string
-}
-
-func (t *PsKey) SetPsKey(value string) PsKey {
- for range Only.Once {
- t.string = value
- t.Valid = true
- }
-
- return *t
-}
-
-func (t *PsKey) SetValue(value string) PsKey {
- for range Only.Once {
- t.string = value
- t.Valid = true
- }
-
- return *t
-}
-
-func SetPsKeyValue(value string) PsKey {
- var t PsKey
- return t.SetValue(value)
-}
diff --git a/iSolarCloud/api/GoStruct/valueTypes/types.go b/iSolarCloud/api/GoStruct/valueTypes/types.go
index 1107b3b98..19191aa4c 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/types.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/types.go
@@ -35,30 +35,6 @@ const (
TypeArrayTime = "[]Time"
TypeArrayUnitValue = "[]UnitValue"
TypeUnitValues = "UnitValues"
-
- // TypeArrayValueTypesBool = "[]valueTypes.Bool"
- // TypeArrayValueTypesCount = "[]valueTypes.Count"
- // TypeArrayValueTypesDateTime = "[]valueTypes.DateTime"
- // TypeArrayValueTypesFloat = "[]valueTypes.Float"
- // TypeArrayValueTypesInteger = "[]valueTypes.Integer"
- // TypeArrayValueTypesPointId = "[]valueTypes.PointId"
- // TypeArrayValueTypesPsKey = "[]valueTypes.PsKey"
- // TypeArrayValuePsId = "[]valueTypes.PsId"
- // TypeArrayValueTypesString = "[]valueTypes.String"
- // TypeArrayValueTypesTime = "[]valueTypes.Time"
- // TypeArrayValueTypesUnitValue = "[]valueTypes.UnitValue"
- //
- // TypeValueTypesBool = "valueTypes.Bool"
- // TypeValueTypesCount = "valueTypes.Count"
- // TypeValueTypesDateTime = "valueTypes.DateTime"
- // TypeValueTypesFloat = "valueTypes.Float"
- // TypeValueTypesInteger = "valueTypes.Integer"
- // TypeValueTypesPointId = "valueTypes.PointId"
- // TypeValueTypesPsKey = "valueTypes.PsKey"
- // TypeValueTypesPsId = "valueTypes.PsId"
- // TypeValueTypesString = "valueTypes.String"
- // TypeValueTypesTime = "valueTypes.Time"
- // TypeValueTypesUnitValue = "valueTypes.UnitValue"
)
@@ -332,7 +308,7 @@ func AnyToUnitValue(ref interface{}, unit string, typeString string, dateFormat
case TypeUnitValues:
fallthrough
case TypeArrayUnitValue:
- for _, val := range ref.([]UnitValue) {
+ for _, val := range ref.(UnitValues) {
uv = append(uv, val)
}
@@ -490,7 +466,11 @@ func AnyToUnitValue(ref interface{}, unit string, typeString string, dateFormat
}
default:
- uv = append(uv, SetUnitValueString("", unit, typeString+ "(unknown)"))
+ j, err := json.Marshal(ref)
+ if err != nil {
+ j = []byte(typeString + "(unknown)")
+ }
+ uv = append(uv, SetUnitValueString(string(j), unit, typeString))
ok = false
}
}
diff --git a/iSolarCloud/api/GoStruct/valueTypes/uuid.go b/iSolarCloud/api/GoStruct/valueTypes/uuid.go
new file mode 100644
index 000000000..382e6cd22
--- /dev/null
+++ b/iSolarCloud/api/GoStruct/valueTypes/uuid.go
@@ -0,0 +1,123 @@
+package valueTypes
+
+import (
+ "encoding/json"
+ "github.com/MickMake/GoUnify/Only"
+ "strconv"
+)
+
+
+type Uuid struct {
+ string `json:"string,omitempty"`
+ int64 `json:"integer,omitempty"`
+ Valid bool `json:"valid"`
+ Error error `json:"-"`
+}
+
+// UnmarshalJSON - Convert JSON to value
+func (t *Uuid) UnmarshalJSON(data []byte) error {
+ for range Only.Once {
+ t.Valid = false
+
+ if len(data) == 0 {
+ break
+ }
+
+ // Store result from int
+ t.Error = json.Unmarshal(data, &t.int64)
+ if t.Error == nil {
+ t.SetValue(t.int64)
+ break
+ }
+
+ // Store result from string
+ t.Error = json.Unmarshal(data, &t.string)
+ if t.Error == nil {
+ t.SetString(t.string)
+ break
+ }
+ }
+
+ return t.Error
+}
+
+// MarshalJSON - Convert value to JSON
+func (t Uuid) MarshalJSON() ([]byte, error) {
+ var data []byte
+
+ for range Only.Once {
+ t.Valid = false
+
+ data, t.Error = json.Marshal(t.int64)
+ if t.Error != nil {
+ break
+ }
+ t.Valid = true
+ // t.string = strconv.FormatInt(t.int64, 10)
+ }
+
+ return data, t.Error
+}
+
+func (t Uuid) Value() int64 {
+ return t.int64
+}
+
+func (t Uuid) String() string {
+ return t.string
+}
+
+func (t Uuid) Match(comp int64) bool {
+ if t.int64 == comp {
+ return true
+ }
+ return false
+}
+
+func (t *Uuid) SetString(value string) Uuid {
+ for range Only.Once {
+ t.string = value
+ t.int64 = 0
+ t.Valid = false
+
+ if value == "" {
+ break
+ }
+
+ if value == "--" {
+ // value = ""
+ break
+ }
+
+ var v int
+ v, t.Error = strconv.Atoi(t.string)
+ if t.Error != nil {
+ break
+ }
+ t.int64 = int64(v)
+ t.Valid = true
+ }
+
+ return *t
+}
+
+func (t *Uuid) SetValue(value int64) Uuid {
+ for range Only.Once {
+ t.string = ""
+ t.int64 = value
+ t.Valid = true
+ t.string = strconv.FormatInt(t.int64, 10)
+ }
+
+ return *t
+}
+
+func SetUuidString(value string) Uuid {
+ var t Uuid
+ return t.SetString(value)
+}
+
+func SetUuidValue(value int64) Uuid {
+ var t Uuid
+ return t.SetValue(value)
+}
diff --git a/iSolarCloud/api/GoStruct/valueTypes/uv.go b/iSolarCloud/api/GoStruct/valueTypes/uv.go
index 9147352e1..250ca5cb3 100644
--- a/iSolarCloud/api/GoStruct/valueTypes/uv.go
+++ b/iSolarCloud/api/GoStruct/valueTypes/uv.go
@@ -20,7 +20,8 @@ type UnitValue struct {
*int64 `json:"value_int,omitempty"`
*bool `json:"value_bool,omitempty"`
- // isFloat bool
+ key string
+ deviceId string
Valid bool `json:"valid"`
Error error `json:"-"`
}
@@ -174,6 +175,8 @@ func (t *UnitValue) UnmarshalJSON(data []byte) error {
t.UnitValueFix()
break
}
+
+ t.Error = nil
}
return t.Error
@@ -231,15 +234,18 @@ func (t UnitValue) MarshalJSON() ([]byte, error) {
}
}
- data = []byte(fmt.Sprintf(`{"unit":"%s","value":"--"}`, t.UnitValue))
+ // t = t.UnitValueFix()
+ data = []byte(fmt.Sprintf(`{"unit":"%s","value":"--","key":"%s"}`, t.UnitValue, t.key))
+
+ t.Error = nil
t.Valid = true
}
return data, t.Error
}
-func (t UnitValue) Value() float64 {
+func (t *UnitValue) Value() float64 {
var ret float64
for range Only.Once {
if t.float64 != nil {
@@ -264,51 +270,55 @@ func (t UnitValue) Value() float64 {
return ret
}
-func (t UnitValue) ValueFloat() float64 {
+func (t *UnitValue) ValueFloat() float64 {
if t.float64 == nil {
return 0
}
return *t.float64
}
-func (t UnitValue) ValueInt() int64 {
+func (t *UnitValue) ValueInt() int64 {
if t.int64 == nil {
return 0
}
return *t.int64
}
-func (t UnitValue) ValueBool() bool {
+func (t *UnitValue) ValueBool() bool {
if t.float64 == nil {
return false
}
return *t.bool
}
+func (t *UnitValue) ValueKey() string {
+ return t.key
+}
+
func (t UnitValue) String() string {
var ret string
for range Only.Once {
- if t.float64 != nil {
- ret = strconv.FormatFloat(*t.float64, 'f', -1, 64)
- break
+ switch {
+ case t.float64 != nil:
+ ret = strconv.FormatFloat(*t.float64, 'f', -1, 64)
+
+ case t.int64 != nil:
+ ret = strconv.FormatInt(*t.int64, 10)
+
+ case t.bool != nil:
+ ret = strconv.FormatBool(*t.bool)
+ default:
+ ret = t.StringValue
}
- if t.int64 != nil {
- ret = strconv.FormatInt(*t.int64, 10)
- break
+ if t.key != "" {
+ ret = fmt.Sprintf(`"%s": "%s"`, t.key, ret)
}
-
- if t.bool != nil {
- ret = strconv.FormatBool(*t.bool)
- break
- }
-
- ret = t.StringValue
}
return ret
}
-func (t UnitValue) MatchFloat(comp float64) bool {
+func (t *UnitValue) MatchFloat(comp float64) bool {
if t.float64 == nil {
return false
}
@@ -318,7 +328,7 @@ func (t UnitValue) MatchFloat(comp float64) bool {
return false
}
-func (t UnitValue) MatchInt(comp int64) bool {
+func (t *UnitValue) MatchInt(comp int64) bool {
if t.int64 == nil {
return false
}
@@ -328,7 +338,7 @@ func (t UnitValue) MatchInt(comp int64) bool {
return false
}
-func (t UnitValue) MatchBool(comp bool) bool {
+func (t *UnitValue) MatchBool(comp bool) bool {
if t.bool == nil {
return false
}
@@ -338,14 +348,18 @@ func (t UnitValue) MatchBool(comp bool) bool {
return false
}
-func (t UnitValue) Unit() string {
+func (t *UnitValue) Unit() string {
return t.UnitValue
}
-func (t UnitValue) Type() string {
+func (t *UnitValue) Type() string {
return t.TypeValue
}
+func (t *UnitValue) DeviceId() string {
+ return t.deviceId
+}
+
var varTrue = true
var varFalse = false
func (t *UnitValue) SetString(value string) UnitValue {
@@ -378,6 +392,7 @@ func (t *UnitValue) SetString(value string) UnitValue {
var v float64
v, t.Error = strconv.ParseFloat(t.StringValue, 64)
if t.Error != nil {
+ t.Error = nil // Less than useful.
break
}
t.SetFloat(v)
@@ -387,6 +402,7 @@ func (t *UnitValue) SetString(value string) UnitValue {
var v int
v, t.Error = strconv.Atoi(t.StringValue)
if t.Error != nil {
+ t.Error = nil // Less than useful.
break
}
t.SetInteger(int64(v))
@@ -492,6 +508,22 @@ func (t *UnitValue) SetType(Type string) UnitValue {
return *t
}
+func (t *UnitValue) SetDeviceId(deviceId string) UnitValue {
+ for range Only.Once {
+ t.deviceId = deviceId
+ }
+
+ return *t
+}
+
+func (t *UnitValue) SetKey(key string) UnitValue {
+ for range Only.Once {
+ t.key = key
+ }
+
+ return *t
+}
+
func SetUnitValueString(value string, unit string, Type string) UnitValue {
var t UnitValue
t = t.SetString(value)
@@ -524,7 +556,7 @@ func SetUnitValueBool(value bool) UnitValue {
return t
}
-type UnitValues []UnitValue
+
type UnitValueMap map[PointId]UnitValue
func (u *UnitValueMap) Sort() []string {
@@ -537,20 +569,62 @@ func (u *UnitValueMap) Sort() []string {
}
-func (t UnitValues) Unit() string {
+type UnitValues []UnitValue
+
+func (t UnitValues) String() string {
var ret string
- for _, v := range t {
+ for range Only.Once {
+ if len(t) == 0 {
+ break
+ }
+
+ if len(t) == 1 {
+ ret = t[0].String()
+ break
+ }
+
+ for i, v := range t {
+ ret += fmt.Sprintf("%d: %s\n", i, v.String())
+ }
+ }
+ return ret
+}
+
+func (t *UnitValues) Unit() string {
+ var ret string
+ for _, v := range *t {
ret = v.Unit()
break
}
return ret
}
-func (t UnitValues) Type() string {
+func (t *UnitValues) Type() string {
var ret string
- for _, v := range t {
+ for _, v := range *t {
ret = v.Type()
break
}
return ret
}
+
+func (t *UnitValues) First() *UnitValue {
+ if len(*t) == 0 {
+ return &UnitValue{}
+ }
+ return &(*t)[0]
+}
+
+func (t *UnitValues) Set(uv UnitValue) *UnitValues {
+ *t = UnitValues{uv}
+ return t
+}
+
+func (t *UnitValues) Append(uv UnitValue) *UnitValues {
+ *t = append(*t, uv)
+ return t
+}
+
+func (t *UnitValues) Length() int {
+ return len(*t)
+}
diff --git a/iSolarCloud/api/file.go b/iSolarCloud/api/file.go
index 1dcf43e0b..72f4a112b 100644
--- a/iSolarCloud/api/file.go
+++ b/iSolarCloud/api/file.go
@@ -2,7 +2,6 @@ package api
import (
"GoSungrow/Only"
- "GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/output"
"GoSungrow/iSolarCloud/api/GoStruct/reflection"
"errors"
@@ -10,22 +9,21 @@ import (
"github.com/MickMake/GoUnify/cmdPath"
"os"
"path/filepath"
- "strings"
)
-func (ep *EndPointStruct) ApiSetFilenamePrefix2(ref interface{}, format string, args ...interface{}) string {
- f := strings.Join(GoStruct.GetStructValuesAsArray(ref), "-")
- fmt.Printf("[%s]\n", f)
- if format != "" {
- ep.FileNamePrefix = fmt.Sprintf(format, args...)
- // ep.FileNamePrefix = fmt.Sprintf("%s_%s-%s", ep.Area, ep.Name, ep.FileNamePrefix)
- ep.FileNamePrefix = string(ep.Area) + "_" + string(ep.Name) + "-" + ep.FileNamePrefix
- } else {
- ep.FileNamePrefix = string(ep.Area) + "_" + string(ep.Name)
- }
- return ep.FileNamePrefix
-}
+// func (ep *EndPointStruct) ApiSetFilenamePrefix2(ref interface{}, format string, args ...interface{}) string {
+// f := strings.Join(GoStruct.GetStructValuesAsArray(ref), "-")
+// fmt.Printf("[%s]\n", f)
+// if format != "" {
+// ep.FileNamePrefix = fmt.Sprintf(format, args...)
+// // ep.FileNamePrefix = fmt.Sprintf("%s_%s-%s", ep.Area, ep.Name, ep.FileNamePrefix)
+// ep.FileNamePrefix = string(ep.Area) + "_" + string(ep.Name) + "-" + ep.FileNamePrefix
+// } else {
+// ep.FileNamePrefix = string(ep.Area) + "_" + string(ep.Name)
+// }
+// return ep.FileNamePrefix
+// }
func (ep *EndPointStruct) ApiSetFilenamePrefix(format string, args ...interface{}) string {
if format != "" {
@@ -38,26 +36,40 @@ func (ep *EndPointStruct) ApiSetFilenamePrefix(format string, args ...interface{
return ep.FileNamePrefix
}
-func (ep *EndPointStruct) GetCsvFilename() string {
- if ep.FileNamePrefix == "" {
- ep.ApiSetFilenamePrefix("")
- }
- return ep.FileNamePrefix + ".csv"
-}
+// func (ep *EndPointStruct) ApiGetCsvFilename() string {
+// if ep.FileNamePrefix == "" {
+// ep.FileNamePrefix = ep.ApiSetFilenamePrefix("")
+// }
+// return ep.FileNamePrefix + ".csv"
+// }
+//
+// func (ep *EndPointStruct) ApiGetTableFilename() string {
+// if ep.FileNamePrefix == "" {
+// ep.FileNamePrefix = ep.ApiSetFilenamePrefix("")
+// }
+// return ep.FileNamePrefix + "-table.txt"
+// }
+//
+// func (ep *EndPointStruct) ApiGetListFilename() string {
+// if ep.FileNamePrefix == "" {
+// ep.FileNamePrefix = ep.ApiSetFilenamePrefix("")
+// }
+// return ep.FileNamePrefix + ".txt"
+// }
-func (ep *EndPointStruct) GetJsonFilename() string {
+func (ep *EndPointStruct) ApiGetJsonFilename() string {
if ep.FileNamePrefix == "" {
- ep.ApiSetFilenamePrefix("")
+ ep.FileNamePrefix = ep.ApiSetFilenamePrefix("")
}
return ep.FileNamePrefix + ".json"
}
-func (ep *EndPointStruct) GetImageFilename() string {
- if ep.FileNamePrefix == "" {
- ep.ApiSetFilenamePrefix("")
- }
- return ep.FileNamePrefix + ".png"
-}
+// func (ep *EndPointStruct) GetImageFilename() string {
+// if ep.FileNamePrefix == "" {
+// ep.FileNamePrefix = ep.ApiSetFilenamePrefix("")
+// }
+// return ep.FileNamePrefix + ".png"
+// }
func (ep *EndPointStruct) GetFilePath() string {
var ret string
@@ -69,37 +81,25 @@ func (ep *EndPointStruct) GetFilePath() string {
break
}
- ret = filepath.Join(hd, ".GoSungrow", ep.GetJsonFilename())
+ ret = filepath.Join(hd, ".GoSungrow", ep.ApiGetJsonFilename())
}
return ret
}
-// FileExists Checks for existance of a local file.
+// FileExists Checks for existence of a local file.
func (ep *EndPointStruct) FileExists(fn string) bool {
var ok bool
for range Only.Once {
if fn == "" {
- fn = ep.GetJsonFilename()
+ fn = ep.ApiGetJsonFilename()
if ep.Error != nil {
break
}
}
- // var f os.FileInfo
- // f, ep.Error = os.Stat(fn)
- // if ep.Error != nil {
- // if os.IsNotExist(ep.Error) {
- // ep.Error = nil
- // }
- // break
- // }
- // if f.IsDir() {
- // ep.Error = errors.New("file is a directory")
- // break
- // }
p := cmdPath.NewPath(fn)
if p.DirExists() {
ep.Error = errors.New("file is a directory")
@@ -119,56 +119,17 @@ func (ep *EndPointStruct) FileExists(fn string) bool {
// ApiReadDataFile - Retrieves data from a local file.
func (ep *EndPointStruct) ApiReadDataFile(ref interface{}) error {
- return output.FileRead(ep.GetJsonFilename(), ref)
-
- // // var ret []byte
- //
- // for range Only.Once {
- // if fn == "" {
- // fn = ep.GetJsonFilename()
- // if ep.Error != nil {
- // break
- // }
- // }
- //
- // var f *os.File
- // f, ep.Error = os.Open(fn)
- // if ep.Error != nil {
- // if os.IsNotExist(ep.Error) {
- // ep.Error = nil
- // }
- // break
- // }
- //
- // //goland:noinspection GoUnhandledErrorResult,GoDeferInLoop
- // defer f.Close()
- //
- // ep.Error = json.NewDecoder(f).Decode(&ref)
- // }
- //
- // // for range Only.Once {
- // // fn := ep.GetFilename()
- // // if ep.Error != nil {
- // // break
- // // }
- // //
- // // ret, ep.Error = os.FileRead(fn)
- // // if ep.Error != nil {
- // // break
- // // }
- // // }
- //
- // return ep.Error
+ return output.FileRead(ep.ApiGetJsonFilename(), ref)
}
// ApiWriteDataFile - Saves data to a file path.
func (ep *EndPointStruct) ApiWriteDataFile(ref interface{}) error {
- return output.FileWrite(ep.GetJsonFilename(), ref, output.DefaultFileMode)
+ return output.FileWrite(ep.ApiGetJsonFilename(), ref, output.DefaultFileMode)
}
// ApiRemoveDataFile - Saves data to a file path.
func (ep *EndPointStruct) ApiRemoveDataFile() error {
- return output.FileRemove(ep.GetJsonFilename())
+ return output.FileRemove(ep.ApiGetJsonFilename())
}
func (ep *EndPointStruct) ApiCacheFilename(request interface{}) string {
@@ -179,68 +140,3 @@ func (ep *EndPointStruct) ApiCacheFilename(request interface{}) string {
func (ep *EndPointStruct) ApiFingerprint(request interface{}) string {
return reflection.GetFingerprint(request)
}
-
-// func (ep *EndPointStruct) ApiCacheFilePath(request interface{}) string {
-// return filepath.Join(ep.ApiRoot.GetCacheDir(), ep.ApiCacheFilename(request))
-// }
-//
-// // ApiCheckCache Retrieves cache data from a local file.
-// func (ep *EndPointStruct) ApiCheckCache(request interface{}) bool {
-// var ok bool
-// for range Only.Once {
-// fn := ep.ApiCacheFilePath(request)
-//
-// var f os.FileInfo
-// f, ep.Error = os.Stat(fn)
-// if ep.Error != nil {
-// if os.IsNotExist(ep.Error) {
-// ep.Error = nil
-// }
-// break
-// }
-//
-// if f.IsDir() {
-// ep.Error = errors.New("file is a directory")
-// break
-// }
-//
-// duration := ep.ApiRoot.GetCacheTimeout()
-// then := f.ModTime()
-// then = then.Add(duration)
-// now := time.Now()
-// if then.Before(now) {
-// break
-// }
-//
-// ok = true
-// }
-//
-// return ok
-// }
-//
-// // CacheRead Retrieves cache data from a local file.
-// func (ep *EndPointStruct) ApiReadCache(request interface{}, ref interface{}) error {
-// return output.FileRead(ep.ApiCacheFilePath(request), ref)
-// }
-//
-// // CacheWrite Saves cache data to a file path.
-// func (ep *EndPointStruct) ApiWriteCache(request interface{}, ref interface{}) error {
-// return output.FileWrite(ep.ApiCacheFilePath(request), ref, output.DefaultFileMode)
-//
-// // for range Only.Once {
-// // fn := ep.ApiCacheFilePath(request)
-// //
-// // var f *os.File
-// // f, ep.Error = os.OpenFile(fn, os.O_RDWR|os.O_CREATE|os.O_TRUNC, output.DefaultFileMode)
-// // if ep.Error != nil {
-// // ep.Error = errors.New(fmt.Sprintf("Unable to write to file %s - %v", fn, ep.Error))
-// // break
-// // }
-// //
-// // //goland:noinspection GoUnhandledErrorResult,GoDeferInLoop
-// // defer f.Close()
-// // ep.Error = json.NewEncoder(f).Encode(ref)
-// // }
-// //
-// // return ep.Error
-// }
diff --git a/iSolarCloud/api/struct_data.go b/iSolarCloud/api/struct_data.go
index 1729de596..59a685f47 100644
--- a/iSolarCloud/api/struct_data.go
+++ b/iSolarCloud/api/struct_data.go
@@ -19,7 +19,8 @@ type DataMap struct {
Map map[string]*DataEntries
Table output.Table
DataTables output.Tables
- Order []string
+ // Order []string
+ Error error
}
func NewDataMap() DataMap {
@@ -34,111 +35,222 @@ func (dm *DataMap) StructToDataMap(endpoint EndPoint, parentDeviceId string, nam
epName.Append(name.Strings()...)
name = epName.Copy()
- timestamp := valueTypes.SetDateTimeValue(time.Now().Round(5 * time.Minute))
+ timestamp := time.Now().Round(5 * time.Minute)
- // Iterate over all available fields and read the tag values
- var Parent GoStruct.Reflect
- Parent.SetByFieldName(endpoint.ResponseRef(), endpoint.ResponseRef(), name.Index(0))
- Parent.DataStructure.Endpoint = name.Copy()
- Current := GoStruct.FindStart("ResultData", Parent, Parent, name)
- name = Current.DataStructure.Endpoint.Copy()
-
- var tp GoStruct.DataStructures
- tp.Debug = false
- tp.ShowEmpty = true
- tp.GetPointTags(&Parent, Current, name)
+ // Parse response structure.
+ var sm GoStruct.StructMap
+ sm.InitScan(endpoint.ResponseRef(), GoStruct.StructMapOptions {
+ StartAt: "ResultData",
+ Name: name,
+ TimeStamp: timestamp,
+ Debug: false,
+ AddUnexported: false,
+ AddUnsupported: false,
+ AddInvalid: false,
+ AddNil: false,
+ AddEmpty: false,
+ })
// Convert to DataMap
- for _, f := range tp.DataMap {
- if f.PointIgnore {
- continue
- }
-
- if f.PointName == "" {
- f.PointName = valueTypes.PointToName(f.PointId)
- }
-
- if f.PointParentId == "" {
- if parentDeviceId != "" {
- f.PointParentId = parentDeviceId
- } else {
- f.PointParentId = "virtual"
- }
- }
-
- // fmt.Printf("DEBUG: StructToPoints(): %s / %s\n", f.Endpoint, f.PointId)
- if f.PointNameDateFormat == "" {
- f.PointNameDateFormat = valueTypes.DateTimeLayout
- }
- uvs, _, ok := valueTypes.AnyToUnitValue(f.Value, f.PointUnit, f.PointValueType, f.PointNameDateFormat)
- if !ok {
+ for _, Child := range sm.Map {
+ pdi := parentDeviceId
+ if Child.IsPointIgnore() {
continue
}
var when valueTypes.DateTime
- if !f.PointTimestamp.IsZero() {
- when = valueTypes.SetDateTimeValue(f.PointTimestamp)
+ if Child.IsPointTimestampNotZero() {
+ when = valueTypes.SetDateTimeValue(Child.DataStructure.PointTimestamp)
} else {
- when = timestamp
+ when = valueTypes.SetDateTimeValue(timestamp)
}
- var point Point
- p := GetPoint(f.Endpoint.String() + "." + f.PointId)
- if p == nil {
- // No point found. Create one.
- point = CreatePoint(parentDeviceId, valueTypes.SetPointIdString(f.PointId), f.PointName, f.PointGroupName, uvs.Unit(), uvs.Type(), f.PointUpdateFreq)
- } else {
- point = *p
- }
- point.UpdateFreq = f.PointUpdateFreq
- point.SetName(f.PointName)
-
- // Add arrays as multiple entries.
- if len(uvs) > 1 {
- // @TODO - Think about adding in arrays of values OR just marshal arrays into JSON.
- res := valueTypes.SizeOfArrayLength(uvs)
- for i, uv := range uvs {
- dm.AddPointUnitValue(JoinWithDots(res, valueTypes.DateTimeLayoutDay, f.Endpoint, i), f.PointParentId, point, when, uv)
- }
- continue
- }
-
- if len(uvs) == 0 {
- fmt.Printf("OOOPS - UVS is nil for %s\n", f.PointId)
- continue
- }
- dm.AddPointUnitValue(f.Endpoint.String(), f.PointParentId, point, when, uvs[0])
-
- if f.PointAliasTo != "" {
- f.PointId = f.PointAliasTo
- dm.AddPointUnitValue(f.Endpoint.String(), f.PointParentId, point, when, uvs[0])
+ if Child.DataStructure.PointDevice != "" {
+ pdi = Child.DataStructure.PointDevice
}
+ dm.AddPointUnitValues(Child, pdi, when)
}
- // Create data tables.
- dm.Table = dm.CreateEndPointResultTable()
- dm.Table.SetTitle("EndPoint Data: %s", name)
- dm.Table.SetFilePrefix("%s_%s", endpoint.GetArea(), endpoint.GetName())
- dm.Table.SetJson([]byte(endpoint.GetJsonData(false)))
- dm.Table.SetRaw([]byte(endpoint.GetJsonData(true)))
+ dm.Error = dm.CreateResultTable(endpoint, sm)
+ if dm.Error != nil {
+ break
+ }
- dm.DataTables = output.NewTables()
- dm.DataTables = tp.DataTables.GetDataMergedTables(timestamp, parentDeviceId)
- dm.DataTables = tp.DataTables.GetDataTables()
+ dm.Error = dm.CreateDataTables(sm)
+ if dm.Error != nil {
+ break
+ }
}
return *dm
}
-func (dm *DataMap) AddPointUnitValue(endpoint string, parentDeviceId string, point Point, date valueTypes.DateTime, uv valueTypes.UnitValue) {
+func (dm *DataMap) CreateDataTables(sm GoStruct.StructMap) error {
for range Only.Once {
- if uv.Unit() != point.Unit {
- fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n", uv.String(), point.Unit, uv.ValueFloat(), uv.Unit())
- point.Unit = uv.Unit()
+ dm.DataTables = output.NewTables()
+
+ names := sm.GetTableNames()
+ for _, name := range names {
+ td := sm.GetTableData(name)
+ if !td.IsValid {
+ continue
+ }
+
+ table := output.NewTable(td.GetHeaders()...)
+ values := td.GetValues()
+ for row := range values {
+ var items []interface{}
+ for col := range values[row] {
+ items = append(items, values[row][col].String())
+ }
+ dm.Error = table.AddRow(items...)
+ if dm.Error != nil {
+ break
+ }
+ }
+ if dm.Error != nil {
+ break
+ }
+
+ title := td.Current.DataStructure.DataTableTitle
+ if title == "" {
+ title = td.Current.DataStructure.DataTableName
+ }
+ if title == "" {
+ title = valueTypes.PointToName(td.Current.DataStructure.DataTableId)
+ }
+ // if title == "" {
+ // title = valueTypes.PointToName(td.Current.DataStructure.PointId)
+ // }
+
+ table.SetTitle("Data Table %s - %s", td.Name, title)
+ if td.Current.DataStructure.DataTableId == "" {
+ table.SetFilePrefix(td.Name)
+ } else {
+ table.SetFilePrefix("%s-%s", td.Name, td.Current.DataStructure.DataTableId)
+ }
+ table.SetGraphFilter("")
+ table.Sort(td.SortOn)
+ table.SetJson(nil)
+ table.SetRaw(nil)
+
+ dm.DataTables[name] = table
+ }
+ }
+
+ return dm.Error
+}
+
+func (dm *DataMap) CreateResultTable(endpoint EndPoint, sm GoStruct.StructMap) error {
+ for range Only.Once {
+ dm.Table = output.NewTable(
+ "Date",
+ "Point Id",
+ "Value",
+ // "(Value)",
+ "Unit",
+ "Unit Type",
+ "Group Name",
+ "Description",
+ "Update Freq",
+ )
+
+ for _, p := range dm.Sort() {
+ entries := dm.Map[p].Entries
+ for _, de := range entries {
+ if de.Hide {
+ continue
+ }
+
+ for _, value := range de.Current.Value {
+ v := value.String()
+ if de.Current.IsTable() {
+ v = "See table: " + de.Current.Name()
+ }
+ dm.Error = dm.Table.AddRow(
+ de.Date.Format(valueTypes.DateTimeLayout),
+ p,
+ v,
+ // de.Value.String(),
+ de.Point.Unit,
+ de.Point.ValueType,
+ de.Point.GroupName,
+ de.Point.Description,
+ de.Point.UpdateFreq,
+ )
+ if dm.Error != nil {
+ break
+ }
+ }
+ }
}
- de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
+ var title string
+ // title = sm.Name.String()
+ // title = valueTypes.PointToName(sm.Start.DataStructure.DataTableId)
+
+ // dm.Table.SetTitle("EndPoint Data: %s.%s", endpoint.GetArea(), endpoint.GetName())
+ dm.Table.SetTitle("EndPoint Data %s - %s", sm.Name.String(), title)
+ // dm.Table.SetFilePrefix("%s_%s", endpoint.GetArea(), endpoint.GetName())
+ dm.Table.SetFilePrefix(sm.Name.String())
+ dm.Table.SetGraphFilter("")
+ dm.Table.Sort("Point Id")
+ dm.Table.SetJson([]byte(endpoint.GetJsonData(false)))
+ dm.Table.SetRaw([]byte(endpoint.GetJsonData(true)))
+ }
+
+ return dm.Error
+}
+
+func (dm *DataMap) AddPointUnitValues(Current *GoStruct.Reflect, parentDeviceId string, date valueTypes.DateTime) {
+
+ for range Only.Once {
+ if parentDeviceId == "" {
+ parentDeviceId = "system"
+ }
+ if Current.DataStructure.PointDevice != "" {
+ parentDeviceId = Current.DataStructure.PointDevice
+ }
+
+ var point Point
+ p := GetPoint(Current.EndPointPath().String())
+ if p == nil {
+ // No point found. Create one.
+ point = CreatePoint(Current, parentDeviceId)
+ } else {
+ point = *p
+ }
+ point.UpdateFreq = Current.DataStructure.PointUpdateFreq
+ point.SetName(Current.DataStructure.PointName)
+
+ if Current.Value.Unit() != point.Unit {
+ fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n",
+ Current.Value.First().String(), point.Unit, Current.Value.First().ValueFloat(), Current.Value.Unit())
+ point.Unit = Current.Value.Unit()
+ }
+
+ // Add arrays as multiple entries.
+ if Current.Value.Length() > 1 {
+ entries := CreatePointDataEntries(Current, parentDeviceId, point, date)
+ for _, de := range entries.Entries {
+ dm.Add(de)
+ }
+ break
+ }
+
+ if Current.Value.Length() == 0 {
+ fmt.Printf("OOOPS - UVS is nil for %s\n", Current.PointId())
+ break
+ }
+
+ de := CreatePointDataEntry(Current, parentDeviceId, point, date, *Current.Value.First())
dm.Add(de)
+
+ if Current.DataStructure.PointAliasTo != "" {
+ Current.DataStructure.PointId = Current.DataStructure.PointAliasTo
+ de = CreatePointDataEntry(Current, parentDeviceId, point, date, *Current.Value.First())
+ dm.Add(de)
+ }
}
}
@@ -168,6 +280,9 @@ func (dm *DataMap) CopyDataEntries(dep DataEntries, endpoint string, pointId str
dm.Add(des.Entries[i])
}
+ if len(des.Entries) == 0 {
+ fmt.Printf("OOOPS\n")
+ }
epn := des.Entries[0].EndPoint
ret = dm.Map[epn]
}
@@ -211,7 +326,6 @@ func (dm *DataMap) AppendMap(add DataMap) {
continue
}
dm.Map[point] = de
- dm.Order = append(dm.Order, point)
if Points.Exists(point) {
fmt.Printf("EXISTS: %s\n", point)
@@ -225,7 +339,7 @@ func (dm *DataMap) Add(de DataEntry) {
for range Only.Once {
// fmt.Printf("DEBUG DataMap.Add() %s - Value(%s):'%s' Parent:'%s'\n", de.FullId(), de.Point.ValueType, de.Value, de.Parent)
endpoint := de.FullId()
- de.Index = len(dm.Order)
+ // de.Index = len(dm.Order)
if dm.Map[endpoint] == nil {
dm.Map[endpoint] = &DataEntries{ Entries: []DataEntry{} }
@@ -234,7 +348,7 @@ func (dm *DataMap) Add(de DataEntry) {
if entries.Add(de) == nil {
break
}
- dm.Order = append(dm.Order, endpoint)
+ // dm.Order = append(dm.Order, endpoint)
if Points.Exists(endpoint) {
fmt.Printf("EXISTS: %s\n", endpoint)
@@ -255,6 +369,7 @@ func (dm *DataMap) Print() {
"Unit",
"Type",
"Value",
+ "(Value)",
"Valid",
"GroupName",
@@ -278,6 +393,7 @@ func (dm *DataMap) Print() {
v.Point.Unit,
v.Point.UpdateFreq,
v.Value,
+ v.Current.Value.First(),
v.Point.Valid,
v.Point.GroupName,
@@ -317,159 +433,151 @@ func (dm *DataMap) TableSort() []string {
return sorted
}
-func (dm *DataMap) CreateEndPointResultTable() output.Table {
- table := output.NewTable(
- "Date",
- "Point Id",
- "Value",
- "Unit",
- "Unit Type",
- "Group Name",
- "Description",
- "Update Freq",
- )
+// func (dm *DataMap) AddAny(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, value interface{}, unit string, Type string, timeSpan string) {
+//
+// for range Only.Once {
+// var point Point
+// p := GetPoint(parentDeviceId + "." + pid.String())
+// if p == nil {
+// // No point found. Create one.
+// point = CreatePoint(parentDeviceId, pid, name, groupName, unit, Type, timeSpan)
+// } else {
+// point = *p
+// }
+//
+// uvs, isNil, ok := valueTypes.AnyToUnitValue(value, unit, Type, valueTypes.DateTimeLayout)
+// if !ok {
+// fmt.Printf("ERROR: AddAny(endpoint '%s', parentId '%s', pid '%s', name '%s', date '%s', value '%v')",
+// endpoint, parentDeviceId, pid, name, date, value)
+// break
+// }
+// if isNil {
+// point.ValueType += "(NIL)"
+// }
+//
+// for _, uv := range uvs {
+// if uv.Unit() != point.Unit {
+// fmt.Printf("OOOPS: Unit mismatch - %f %s != %f %s\n", value, point.Unit, uv.ValueFloat(), uv.Unit())
+// point.Unit = uv.Unit()
+// }
+//
+// var parent ParentDevice
+// parent.Set(parentDeviceId)
+// point.Parents.Add(parent)
+//
+// de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
+// de.Point = &point
+// dm.Add(de)
+// }
+// }
+// }
- for range Only.Once {
- for _, p := range dm.Sort() {
- // _ = table.SetHeader(
- // "Date",
- // "Point Id",
- // "Value",
- // "Unit",
- // "Unit Type",
- // "Group Name",
- // "Description",
- // "Update Freq",
- // )
-
- entries := dm.Map[p].Entries
- for _, de := range entries {
- if de.Hide {
- continue
- }
-
- _ = table.AddRow(de.Date.Format(valueTypes.DateTimeLayout),
- p,
- de.Value.String(),
- de.Point.Unit,
- de.Point.ValueType,
- de.Point.GroupName,
- de.Point.Description,
- de.Point.UpdateFreq,
- )
- }
- }
- }
-
- return table
-}
-
-func (dm *DataMap) AddAny(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, value interface{}, unit string, Type string, timeSpan string) {
-
- for range Only.Once {
- var point Point
- p := GetPoint(parentDeviceId + "." + pid.String())
- if p == nil {
- // No point found. Create one.
- point = CreatePoint(parentDeviceId, pid, name, groupName, unit, Type, timeSpan)
- } else {
- point = *p
- }
-
- uvs, isNil, ok := valueTypes.AnyToUnitValue(value, unit, Type, valueTypes.DateTimeLayout)
- if !ok {
- fmt.Printf("ERROR: AddAny(endpoint '%s', parentId '%s', pid '%s', name '%s', date '%s', value '%v')",
- endpoint, parentDeviceId, pid, name, date, value)
- break
- }
- if isNil {
- point.ValueType += "(NIL)"
- }
-
- for _, uv := range uvs {
- if uv.Unit() != point.Unit {
- fmt.Printf("OOOPS: Unit mismatch - %f %s != %f %s\n", value, point.Unit, uv.ValueFloat(), uv.Unit())
- point.Unit = uv.Unit()
- }
-
- var parent ParentDevice
- parent.Set(parentDeviceId)
- point.Parents.Add(parent)
-
- de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
- de.Point = &point
- dm.Add(de)
- }
- }
-}
-
-func (dm *DataMap) AddUnitValue(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, uv valueTypes.UnitValue, timeSpan string) {
-
- for range Only.Once {
- var point Point
- p := GetPoint(parentDeviceId + "." + pid.String())
- if p == nil {
- // No point found. Create one.
- point = CreatePoint(parentDeviceId, pid, name, groupName, uv.Unit(), uv.Type(), timeSpan)
- } else {
- point = *p
- }
-
- if uv.Unit() != point.Unit {
- fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n", uv.String(), point.Unit, uv.ValueFloat(), uv.Unit())
- point.Unit = uv.Unit()
- }
-
- var parent ParentDevice
- parent.Set(parentDeviceId)
- point.Parents.Add(parent)
-
- de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
- de.Point = &point
- dm.Add(de)
- }
-}
+// func (dm *DataMap) AddUnitValue(endpoint string, parentDeviceId string, pid valueTypes.PointId, name string, groupName string, date valueTypes.DateTime, uv valueTypes.UnitValue, timeSpan string) {
+//
+// for range Only.Once {
+// var point Point
+// p := GetPoint(parentDeviceId + "." + pid.String())
+// if p == nil {
+// // No point found. Create one.
+// point = CreatePoint(parentDeviceId, pid, name, groupName, uv.Unit(), uv.Type(), timeSpan)
+// } else {
+// point = *p
+// }
+//
+// if uv.Unit() != point.Unit {
+// fmt.Printf("OOOPS: Unit mismatch - %s %s != %f %s\n", uv.String(), point.Unit, uv.ValueFloat(), uv.Unit())
+// point.Unit = uv.Unit()
+// }
+//
+// var parent ParentDevice
+// parent.Set(parentDeviceId)
+// point.Parents.Add(parent)
+//
+// de := CreatePointDataEntry(endpoint, parentDeviceId, point, date, uv)
+// de.Point = &point
+// dm.Add(de)
+// }
+// }
-func CreatePointDataEntry(endpoint string, parentDeviceId string, point Point, dateTime valueTypes.DateTime, uv valueTypes.UnitValue) DataEntry {
+func CreatePointDataEntry(Current *GoStruct.Reflect, parentDeviceId string, point Point, dateTime valueTypes.DateTime, uv valueTypes.UnitValue) DataEntry {
+ // CreatePointDataEntry(Current, Current.EndPointPath().String(), parentDeviceId, point, date, *Current.Value.First())
var ret DataEntry
for range Only.Once {
ret = DataEntry {
- EndPoint: endpoint,
+ Current: Current,
+ EndPoint: Current.EndPointPath().String(),
Point: &point,
Parent: NewParentDevice(parentDeviceId),
Date: dateTime,
Value: uv,
Valid: true,
Hide: false,
- Index: 0,
+ // Index: 0,
}
}
return ret
}
-func CreatePoint(parentId string, pid valueTypes.PointId, name string, groupName string, unit string, Type string, timeSpan string) Point {
+func CreatePointDataEntries(Current *GoStruct.Reflect, parentDeviceId string, point Point, dateTime valueTypes.DateTime) DataEntries {
+ var ret DataEntries
+ for range Only.Once {
+ if Current.Value.Length() <= 1 {
+ break
+ }
+
+ res := valueTypes.SizeOfArrayLength(Current.Value.Length())
+ for i, uv := range Current.Value {
+ epn := JoinWithDots(res, valueTypes.DateTimeLayoutDay, Current.EndPointPath().String(), i)
+ ret.Entries = append(ret.Entries, DataEntry {
+ Current: Current,
+ EndPoint: epn, // Current.EndPointPath().String(),
+ Point: &point,
+ Parent: NewParentDevice(parentDeviceId),
+ Date: dateTime,
+ Value: uv,
+ Valid: true,
+ Hide: false,
+ // Index: 0,
+ })
+ }
+ }
+
+ return ret
+}
+
+func CreatePoint(Current *GoStruct.Reflect, parentDeviceId string) Point {
+ // parentDeviceId string - parentDeviceId
+ // pid valueTypes.PointId - valueTypes.SetPointIdString(Current.PointId())
+ // name string - Current.DataStructure.PointName
+ // groupName string - Current.DataStructure.PointGroupName
+ // unit string - Current.Value.Unit()
+ // Type string - Current.Value.Type()
+ // timeSpan string - Current.DataStructure.PointUpdateFreq
+
var point Point
for range Only.Once {
+ pid := valueTypes.SetPointIdString(Current.PointId())
+ name := Current.DataStructure.PointName
if name == "" {
name = pid.PointToName()
}
var parent ParentDevice
- parent.Set(parentId)
+ parent.Set(parentDeviceId)
var parents ParentDevices
parents.Add(parent)
point = Point {
Parents: parents,
Id: pid,
- GroupName: groupName,
+ GroupName: Current.DataStructure.PointGroupName,
Description: name,
- Unit: unit,
- UpdateFreq: timeSpan,
- ValueType: Type,
- Valid: true,
+ Unit: Current.Value.Unit(),
+ UpdateFreq: Current.DataStructure.PointUpdateFreq,
+ ValueType: Current.Value.Type(),
+ Valid: Current.IsOk,
States: nil,
}
point.FixUnitType()
diff --git a/iSolarCloud/api/struct_de.go b/iSolarCloud/api/struct_de.go
index f2e7ce51a..1675e08ac 100644
--- a/iSolarCloud/api/struct_de.go
+++ b/iSolarCloud/api/struct_de.go
@@ -1,12 +1,14 @@
package api
import (
+ "GoSungrow/iSolarCloud/api/GoStruct"
"GoSungrow/iSolarCloud/api/GoStruct/valueTypes"
"github.com/MickMake/GoUnify/Only"
)
type DataEntry struct {
+ Current *GoStruct.Reflect `json:"-"`
EndPoint string `json:"endpoint"`
Point *Point `json:"point"`
Parent ParentDevice `json:"parent"`
@@ -15,7 +17,7 @@ type DataEntry struct {
Valid bool `json:"valid"`
Hide bool `json:"hide"`
- Index int `json:"index"`
+ // Index int `json:"index"`
}
func (de *DataEntry) IsValid() bool {
diff --git a/iSolarCloud/api/struct_dpe.go b/iSolarCloud/api/struct_dpe.go
index 3bef12fb2..3cb3ef2a9 100644
--- a/iSolarCloud/api/struct_dpe.go
+++ b/iSolarCloud/api/struct_dpe.go
@@ -8,11 +8,13 @@ import (
type DataEntries struct {
Entries []DataEntry
+ // Map *GoStruct.StructMap
}
func NewDataPointEntries() DataEntries {
return DataEntries{
Entries: []DataEntry{},
+ // Map: &GoStruct.StructMap{},
}
}
@@ -46,6 +48,7 @@ func (de *DataEntries) GetEntry(index int) *DataEntry {
}
}
return &(de.Entries[index])
+ // return &(de.Entries[index])
}
func (de *DataEntries) GetEntryValue(index int) valueTypes.UnitValue {
diff --git a/iSolarCloud/api/struct_point.go b/iSolarCloud/api/struct_point.go
index 8ef644b85..4764cb33a 100644
--- a/iSolarCloud/api/struct_point.go
+++ b/iSolarCloud/api/struct_point.go
@@ -126,7 +126,11 @@ func GetPoint(point string) *Point {
}
func GetDevicePoint(devicePoint string) *Point {
- return Points.GetDevicePoint(devicePoint)
+ point := Points.GetDevicePoint(devicePoint)
+ if point == nil {
+ point = &Point{Valid: false}
+ }
+ return point
}
// func GetPointInt(device string, point int64) *Point {
diff --git a/iSolarCloud/data.go b/iSolarCloud/data.go
index ad9eb2e75..a07fd245a 100644
--- a/iSolarCloud/data.go
+++ b/iSolarCloud/data.go
@@ -72,7 +72,7 @@ func (sgd *SunGrowDataResponse) GetOutput(outputType output.OutputType, saveAsFi
}
}
if !ok {
- fmt.Printf("No data table results for '%s'", sgd.Title)
+ fmt.Printf("No data table results for '%s'\n", sgd.Title)
}
break
}
@@ -296,21 +296,12 @@ func (sgd *SunGrowData) CallEndpoint(endpoint api.EndPoint, request SunGrowDataR
break
}
- response.Filename = request.GetFilename("")
- response.Filename = endpoint.SetFilenamePrefix(response.Filename)
- // response.Filename = request.CreateFilename(ep)
- if response.Title == "" {
- response.Title = fmt.Sprintf("Data Request %s", endpoint.GetName())
- }
-
response.Data = endpoint.GetEndPointData()
- // endpoint.GetEndPointDataTables()
- // response.Table = endpoint.GetEndPointResultTable()
- // response.Table.SetTitle(response.Title)
- // response.Data.Table.SetGraphFilter("")
- response.Data.Table.SetFilePrefix(request.GetFilename(string(endpoint.GetName())))
+ response.Data.Table.AppendFilePrefix(request.RequestAsFilePrefix()) // request.GetFilename(endpoint.GetName().String()))
response.Data.Table.SetSaveFile(sgd.saveAsFile)
response.Data.Table.OutputType = sgd.outputType
+ response.Title = response.Data.Table.GetTitle()
+ response.Filename = response.Data.Table.GetFilePrefix()
}
return response
diff --git a/iSolarCloud/data_request.go b/iSolarCloud/data_request.go
index 23db493c8..0707c4824 100644
--- a/iSolarCloud/data_request.go
+++ b/iSolarCloud/data_request.go
@@ -411,36 +411,9 @@ func (sgd *SunGrowDataRequest) Help(endpoint api.EndPoint) {
}
}
-func (sgd *SunGrowDataRequest) GetFilename(prefix string) string {
+func (sgd *SunGrowDataRequest) RequestAsFilePrefix() string {
var ret string
for range Only.Once {
- // aret := []string{ prefix }
- // if sgd.args.PsId != nil {
- // a := sgd.args.PsId.String()
- // if a != "" { aret = append(aret, a) }
- // }
- //
- // if sgd.args.DateId != nil {
- // a := sgd.args.DateId.Original()
- // if a != "" { aret = append(aret, a) }
- // }
- //
- // if sgd.args.ReportType != nil {
- // a := sgd.args.ReportType.String()
- // if a != "" { aret = append(aret, a) }
- // }
- //
- // if sgd.args.FaultTypeCode != nil {
- // a := sgd.args.FaultTypeCode.String()
- // if a != "" { aret = append(aret, a) }
- // }
- //
- // if sgd.args.Uuid != nil {
- // a := sgd.args.Uuid.String()
- // if a != "" { aret = append(aret, a) }
- // }
-
- ret += prefix
j, err := json.Marshal(*sgd)
if err != nil {
break
@@ -450,7 +423,6 @@ func (sgd *SunGrowDataRequest) GetFilename(prefix string) string {
ret = strings.TrimSuffix(ret, "}")
ret = strings.ReplaceAll(ret, `"`, ``)
ret = strings.ReplaceAll(ret, `,`, `-`)
- // ret = strings.Join(aret, "-")
}
return ret
}
diff --git a/mmHa/binary_sensor.go b/mmHa/binary_sensor.go
index 0937fcfac..80616406b 100644
--- a/mmHa/binary_sensor.go
+++ b/mmHa/binary_sensor.go
@@ -3,6 +3,7 @@ package mmHa
import (
"GoSungrow/Only"
"encoding/json"
+ "strings"
)
@@ -96,12 +97,21 @@ func (m *Mqtt) BinarySensorPublishValue(config EntityConfig) error {
id := JoinStringsForId(m.DeviceName, config.FullId)
// tagId := JoinStringsForId(m.Device.Name, config.ParentName, config.Name, config.UniqueId),
+ tag := JoinStringsForTopic(m.binarySensorPrefix, id, "state")
+
+ // @TODO - Real hack here. Need to properly check for JSON.
+ if strings.Contains(config.Value, `{`) || strings.Contains(config.Value, `":`) {
+ t := m.client.Publish(tag, 0, true, config.Value)
+ if !t.WaitTimeout(m.Timeout) {
+ m.err = t.Error()
+ }
+ break
+ }
payload := MqttState {
LastReset: m.GetLastReset(config.UniqueId),
Value: config.Value,
}
- tag := JoinStringsForTopic(m.binarySensorPrefix, id, "state")
t := m.client.Publish(tag, 0, true, payload.Json())
if !t.WaitTimeout(m.Timeout) {
m.err = t.Error()
diff --git a/mmHa/sensors.go b/mmHa/sensors.go
index 13314389c..aa06f3cab 100644
--- a/mmHa/sensors.go
+++ b/mmHa/sensors.go
@@ -4,6 +4,7 @@ import (
"GoSungrow/Only"
"encoding/json"
"fmt"
+ "strings"
)
@@ -164,11 +165,21 @@ func (m *Mqtt) SensorPublishValue(config EntityConfig) error {
}
id := JoinStringsForId(m.DeviceName, config.FullId)
- payload := MqttState {
+ tag := JoinStringsForTopic(m.sensorPrefix, id, "state")
+
+ // @TODO - Real hack here. Need to properly check for JSON.
+ if strings.Contains(config.Value, `{`) || strings.Contains(config.Value, `":`) {
+ t := m.client.Publish(tag, 0, true, config.Value)
+ if !t.WaitTimeout(m.Timeout) {
+ m.err = t.Error()
+ }
+ break
+ }
+
+ payload := MqttState{
LastReset: m.GetLastReset(config.FullId),
Value: config.Value,
}
- tag := JoinStringsForTopic(m.sensorPrefix, id, "state")
t := m.client.Publish(tag, 0, true, payload.Json())
if !t.WaitTimeout(m.Timeout) {
m.err = t.Error()