v2.3.2 - Refactor #2

cmd/cmd_data.go

@@ -66,7 +66,7 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 
 		// ********************************************************************************
 		var cmdDataGet = &cobra.Command{
-			Use:                   "get",
+			Use:                   "get < [area.]<endpoint> | <command> >",
 			Aliases:               []string{output.StringTypeTable},
 			Annotations:           map[string]string{"group": "Data"},
 			Short:                 fmt.Sprintf("Get high-level data from iSolarCloud (table)"),
@@ -88,11 +88,11 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 			Args:                  cobra.MinimumNArgs(0),
 		}
 		c.SelfCmd.AddCommand(cmdDataGet)
-		cmdDataGet.Example = cmdHelp.PrintExamples(cmdDataGet, "[area.]<endpoint>")
+		cmdDataGet.Example = cmdHelp.PrintExamples(cmdDataGet, "queryDeviceList", "WebAppService.showPSView", "stats")
 
 		// ********************************************************************************
 		var cmdDataRaw = &cobra.Command{
-			Use:                   output.StringTypeRaw,
+			Use:                   output.StringTypeRaw + " < [area.]<endpoint> | <command> >",
 			Aliases:               []string{},
 			Annotations:           map[string]string{"group": "Data"},
 			Short:                 fmt.Sprintf("Get high-level data from iSolarCloud (raw)"),
@@ -118,7 +118,7 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 
 		// ********************************************************************************
 		var cmdDataJson = &cobra.Command{
-			Use:                   output.StringTypeJson,
+			Use:                   output.StringTypeJson + " < [area.]<endpoint> | <command> >",
 			Aliases:               []string{},
 			Annotations:           map[string]string{"group": "Data"},
 			Short:                 fmt.Sprintf("Get high-level data from iSolarCloud (json)"),
@@ -140,11 +140,11 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 			Args:                  cobra.MinimumNArgs(0),
 		}
 		c.SelfCmd.AddCommand(cmdDataJson)
-		cmdDataJson.Example = cmdHelp.PrintExamples(cmdDataJson, "[area.]<endpoint>")
+		cmdDataJson.Example = cmdHelp.PrintExamples(cmdDataJson, "queryDeviceList", "WebAppService.showPSView", "stats")
 
 		// ********************************************************************************
 		var cmdDataCsv = &cobra.Command{
-			Use:                   output.StringTypeCsv,
+			Use:                   output.StringTypeCsv + " < [area.]<endpoint> | <command> >",
 			Aliases:               []string{},
 			Annotations:           map[string]string{"group": "Data"},
 			Short:                 fmt.Sprintf("Get high-level data from iSolarCloud (json)"),
@@ -166,11 +166,11 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 			Args:                  cobra.MinimumNArgs(0),
 		}
 		c.SelfCmd.AddCommand(cmdDataCsv)
-		cmdDataCsv.Example = cmdHelp.PrintExamples(cmdDataCsv, "[area.]<endpoint>")
+		cmdDataCsv.Example = cmdHelp.PrintExamples(cmdDataCsv, "queryDeviceList", "WebAppService.showPSView", "stats")
 
 		// ********************************************************************************
 		var cmdDataGraph = &cobra.Command{
-			Use:                   output.StringTypeGraph,
+			Use:                   output.StringTypeGraph + " < [area.]<endpoint> | <command> >",
 			Aliases:               []string{},
 			Annotations:           map[string]string{"group": "Data"},
 			Short:                 fmt.Sprintf("Get high-level data from iSolarCloud (graph)"),
@@ -192,7 +192,7 @@ func (c *CmdData) AttachCommand(cmd *cobra.Command) *cobra.Command {
 			Args:                  cobra.MinimumNArgs(0),
 		}
 		c.SelfCmd.AddCommand(cmdDataGraph)
-		cmdDataGraph.Example = cmdHelp.PrintExamples(cmdDataGraph, "[area.]<endpoint> ''")
+		cmdDataGraph.Example = cmdHelp.PrintExamples(cmdDataGraph, "queryDeviceList", "WebAppService.showPSView", "stats")
 	}
 	return c.SelfCmd
 }
@@ -212,11 +212,18 @@ func SplitArg(arg string) []string {
 	return ret
 }
 
+const (
+	argEndpoints = 0
+	argPsIds = 1
+	argDate = 2
+	argReportType = 3
+	argFaultTypeCode = 4
+)
 func (c *CmdData) GetEndpoints(cmd *cobra.Command, args []string) error {
 	// endpoints string, psIds string, date string
 	for range Only.Once {
 		cmds.Api.SunGrow.SetOutputType(cmd.Use)
-		args = cmdConfig.FillArray(4, args)
+		args = cmdConfig.FillArray(5, args)
 
 		for i := range args {
 			if args[i] == "." {
@@ -225,26 +232,31 @@ func (c *CmdData) GetEndpoints(cmd *cobra.Command, args []string) error {
 		}
 
 		var e []string
-		if args[0] != "" {
-			e = SplitArg(args[0])
+		if args[argEndpoints] != "" {
+			e = SplitArg(args[argEndpoints])
 		}
 
 		var p []valueTypes.Integer
-		for _, psId := range SplitArg(args[1]) {
+		for _, psId := range SplitArg(args[argPsIds]) {
 			if psId == "" {
 				continue
 			}
 			p = append(p, valueTypes.SetIntegerString(psId))
 		}
 
-		d := valueTypes.SetDateTimeString(args[2])
+		d := valueTypes.SetDateTimeString(args[argDate])
 
-		rt := args[3]
+		rt := args[argReportType]
 		if rt == "" {
 			rt = "1"
 		}
 
-		c.Error = cmds.Api.SunGrow.GetEndpoints(e, p, *d, rt)
+		ftc := args[argFaultTypeCode]
+		// if ftc == "" {
+		// 	ftc = "1"
+		// }
+
+		c.Error = cmds.Api.SunGrow.GetEndpoints(e, p, *d, rt, ftc)
 	}
 
 	return c.Error

cmd/cmd_mqtt.go

@@ -353,7 +353,7 @@ func (ca *Cmds) MqttCron() error {
 			}
 
 			for _, endpoint := range All {
-				response := data.Get(endpoint, iSolarCloud.SunGrowDataRequest{ PsId: psId })
+				response := data.GetByApi(endpoint, iSolarCloud.SunGrowDataRequest{ PsId: psId })
 				ca.Error = ca.Update(endpoint, response.Data, newDay)
 				if ca.Error != nil {
 					break

iSolarCloud/AliSmsService/msgDownwardStatusReceipt/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/acceptPsSharing/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/activateEmail/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addConfig/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addDeviceRepair/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addDeviceToStructureForHousehold/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addDeviceToStructureForHouseholdByPsIdS/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addFault/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addFaultOrder/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addFaultPlan/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addFaultRepairSteps/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addHouseholdEvaluation/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addHouseholdLeaveMessage/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addHouseholdOpinionFeedback/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addHouseholdWorkOrder/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addOnDutyInfo/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addOperRule/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}

iSolarCloud/AppService/addOrDelPsStructure/struct.go

@@ -370,3 +370,13 @@ func (e EndPoint) GetEndPointData() api.DataMap {
 func (e EndPoint) GetEndPointDataTable() output.Table {
 	return e.ApiRoot.GetDataTable(e)
 }
+
+// SetFilenamePrefix - Produce filename based on area and endpoint name.
+func (e EndPoint) SetFilenamePrefix(format string, args ...interface{}) string {
+	return e.ApiSetFilenamePrefix(format, args...)
+}
+
+// GetRequestArgNames -
+func (e EndPoint) GetRequestArgNames() map[string]string {
+	return e.ApiGetRequestArgNames(e.Request.RequestData)
+}