v2.3.2 - Refactor #2

MickMake · Oct 28, 2022 · 6711382 · 6711382
1 parent 19351d5
commit 6711382
Show file tree

Hide file tree

Showing 92 changed files with 2,151 additions and 3,399 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/cmd/cmd_data.go b/cmd/cmd_data.go
@@ -3,9 +3,7 @@ package cmd
 import (
 	"GoSungrow/Only"
 	"GoSungrow/iSolarCloud/api/output"
-	"GoSungrow/iSolarCloud/api/valueTypes"
 	"fmt"
-	"github.com/MickMake/GoUnify/cmdConfig"
 	"github.com/MickMake/GoUnify/cmdHelp"
 	"github.com/spf13/cobra"
 	"strings"
@@ -222,41 +220,17 @@ const (
 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(5, args)
+		cmds.Api.SunGrow.SetOutputType(cmd.Name())
 
-		for i := range args {
-			if args[i] == "." {
-				args[i] = ""
-			}
-		}
-
-		var e []string
-		if args[argEndpoints] != "" {
-			e = SplitArg(args[argEndpoints])
-		}
-
-		var p []valueTypes.Integer
-		for _, psId := range SplitArg(args[argPsIds]) {
-			if psId == "" {
-				continue
-			}
-			p = append(p, valueTypes.SetIntegerString(psId))
-		}
-
-		d := valueTypes.SetDateTimeString(args[argDate])
-
-		rt := args[argReportType]
-		if rt == "" {
-			rt = "1"
-		}
-
-		ftc := args[argFaultTypeCode]
-		// if ftc == "" {
-		// 	ftc = "1"
+		// args = cmdConfig.FillArray(5, args)
+		// for i := range args {
+		// 	if args[i] == "." {
+		// 		args[i] = ""
+		// 	}
 		// }
+		// c.Error = cmds.Api.SunGrow.GetEndpoints(SplitArg(args[argEndpoints]), SplitArg(args[argPsIds]), args[argDate], args[argReportType], args[argFaultTypeCode])
 
-		c.Error = cmds.Api.SunGrow.GetEndpoints(e, p, *d, rt, ftc)
+		c.Error = cmds.Api.SunGrow.GetEndpoints(SplitArg(args[argEndpoints]), args[1:]...)
 	}
 
 	return c.Error

diff --git a/cmd/cmd_mqtt.go b/cmd/cmd_mqtt.go
@@ -353,7 +353,7 @@ func (ca *Cmds) MqttCron() error {
 			}
 
 			for _, endpoint := range All {
-				response := data.GetByApi(endpoint, iSolarCloud.SunGrowDataRequest{ PsId: psId })
+				response := data.GetByEndPointName(endpoint, iSolarCloud.SunGrowDataRequest{ PsId: &psId })
 				ca.Error = ca.Update(endpoint, response.Data, newDay)
 				if ca.Error != nil {
 					break

diff --git a/iSolarCloud/AppService/findCodeValueList/data.go b/iSolarCloud/AppService/findCodeValueList/data.go
@@ -12,7 +12,7 @@ const Url = "/v1/commonService/findCodeValueList"
 const Disabled = false
 
 type RequestData struct {
-	CodeType string `json:"code_type" required:"true"`
+	CodeType valueTypes.String `json:"code_type" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {

diff --git a/iSolarCloud/AppService/findPsType/data.go b/iSolarCloud/AppService/findPsType/data.go
@@ -12,7 +12,7 @@ const Url = "/v1/powerStationService/findPsType"
 const Disabled = false
 
 type RequestData struct {
-	PsId valueTypes.Integer `json:"ps_id" required:"true"`
+	PsId valueTypes.PsId `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -46,12 +46,8 @@ func (e *EndPoint) GetData() api.DataMap {
 	for range Only.Once {
 		pkg := apiReflect.GetName("", *e)
 		dt := valueTypes.NewDateTime(valueTypes.Now)
-		entries.StructToPoints(e.Response.ResultData, pkg, e.Request.PsId.String(), dt)
-
-		// for _, d := range e.Response.ResultData {
-		// 	name := fmt.Sprintf("%s.%s", pkg, e.Request.PsId.String())
-		// 	entries.StructToPoints(d, name, e.Request.PsId.String(), dt)
-		// }
+		name := pkg + "." + e.Request.PsId.String()
+		entries.StructToPoints(e.Response.ResultData, name, e.Request.PsId.String(), dt)
 	}
 
 	return entries

diff --git a/iSolarCloud/AppService/getAllDeviceByPsId/data.go b/iSolarCloud/AppService/getAllDeviceByPsId/data.go
@@ -13,7 +13,7 @@ const Url = "/v1/devService/getAllDeviceByPsId"
 const Disabled = false
 
 type RequestData struct {
-	PsId valueTypes.Integer `json:"ps_id" required:"true"`
+	PsId valueTypes.PsId `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {

diff --git a/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go b/iSolarCloud/AppService/getAllPowerDeviceSetName/data.go
@@ -25,7 +25,7 @@ func (rd RequestData) Help() string {
 
 type ResultData []struct {
 	Remark  string `json:"remark"`
-	SetID   valueTypes.Integer  `json:"set_id"`
+	SetId   valueTypes.Integer  `json:"set_id"`
 	SetName string `json:"set_name"`
 }
 

diff --git a/iSolarCloud/AppService/getAreaList/data.go b/iSolarCloud/AppService/getAreaList/data.go
@@ -28,7 +28,7 @@ type ResultData struct {
 		FaultStationCount valueTypes.Integer   `json:"fault_station_count"`
 		IsHaveEsPs        valueTypes.Bool      `json:"is_have_es_ps"`
 		IsLeaf            valueTypes.Bool      `json:"is_leaf"`
-		OrgID             valueTypes.Integer   `json:"org_id"`
+		OrgId             valueTypes.Integer   `json:"org_id"`
 		OrgName           valueTypes.String    `json:"org_name"`
 		P83048            valueTypes.UnitValue `json:"p83048"`
 		P83049            valueTypes.UnitValue `json:"p83049"`
@@ -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" PointNameFromAppend:"false"`
+	} `json:"pageList" PointId:"page_list" PointNameFromChild:"OrgId" PointNameFromAppend:"false"`
 	RowCount valueTypes.Integer `json:"rowCount" PointIgnore:"true"`
 }
 

diff --git a/iSolarCloud/AppService/getChnnlListByPsId/data.go b/iSolarCloud/AppService/getChnnlListByPsId/data.go
@@ -13,7 +13,7 @@ const Url = "/v1/devService/getChnnlListByPsId"
 const Disabled = false
 
 type RequestData struct {
-	PsId valueTypes.Integer `json:"ps_id" required:"true"`
+	PsId valueTypes.PsId `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {

diff --git a/iSolarCloud/AppService/getCloudList/data.go b/iSolarCloud/AppService/getCloudList/data.go
@@ -25,10 +25,10 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	CloudList []struct {
-		CloudID    valueTypes.Integer  `json:"cloud_id"`
+		CloudId    valueTypes.Integer  `json:"cloud_id"`
 		CloudName  string `json:"cloud_name"`
 		GatewayURL string `json:"gateway_url"`
-		OrderID    valueTypes.Integer  `json:"order_id"`
+		OrderId    valueTypes.Integer  `json:"order_id"`
 		ServiceURL string `json:"service_url"`
 		Value      string `json:"value"`
 		ValueDeDe  string `json:"value_de_de"`
@@ -49,10 +49,10 @@ type ResultData struct {
 		WebURL     string `json:"web_url"`
 	} `json:"cloud_list"`
 	CurrentCloud struct {
-		CloudID    valueTypes.Integer  `json:"cloud_id"`
+		CloudId    valueTypes.Integer  `json:"cloud_id"`
 		CloudName  string `json:"cloud_name"`
 		GatewayURL string `json:"gateway_url"`
-		OrderID    valueTypes.Integer  `json:"order_id"`
+		OrderId    valueTypes.Integer  `json:"order_id"`
 		ServiceURL string `json:"service_url"`
 		Value      string `json:"value"`
 		ValueDeDe  string `json:"value_de_de"`

diff --git a/iSolarCloud/AppService/getDeviceList/data.go b/iSolarCloud/AppService/getDeviceList/data.go
@@ -13,7 +13,7 @@ const Url = "/v1/devService/getDeviceList"
 const Disabled = false
 
 type RequestData struct {
-	PsId valueTypes.Integer `json:"ps_id" required:"true"`
+	PsId valueTypes.PsId `json:"ps_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {
@@ -38,7 +38,7 @@ type ResultData struct {
 		DeviceArea              valueTypes.Integer  `json:"device_area"`
 		DeviceCode              valueTypes.Integer  `json:"device_code"`
 		DeviceFactoryDate       valueTypes.DateTime `json:"device_factory_date"`
-		DeviceID                valueTypes.Integer  `json:"device_id"`
+		DeviceId                valueTypes.Integer  `json:"device_id"`
 		DeviceModel             valueTypes.String   `json:"device_model"`
 		DeviceModelCode         valueTypes.String   `json:"device_model_code"`
 		DeviceModelId           valueTypes.Integer  `json:"device_model_id"`
@@ -65,7 +65,7 @@ type ResultData struct {
 		P24                     interface{}         `json:"p24"`
 		Posx                    interface{}         `json:"posx"`
 		Posy                    interface{}         `json:"posy"`
-		PsId                    valueTypes.Integer  `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"`
@@ -88,15 +88,15 @@ func (e *ResultData) IsValid() error {
 
 type Device struct {
 	Vendor        valueTypes.String
-	PsId          valueTypes.Integer
+	PsId          valueTypes.PsId
 	PsKey         valueTypes.PsKey
 	DeviceName    valueTypes.String
 	DeviceProSn   valueTypes.String
 	DeviceModel   valueTypes.String
 	DeviceType    valueTypes.Integer
 	DeviceCode    valueTypes.Integer
 	ChannelId     valueTypes.Integer
-	DeviceModelID valueTypes.Integer
+	DeviceModelId valueTypes.Integer
 	TypeName      valueTypes.String
 	DeviceState   valueTypes.Integer
 	DevStatus     valueTypes.Integer
@@ -117,7 +117,7 @@ func (e *EndPoint) GetDevices() Devices {
 			TypeName:      d.TypeName,
 			DeviceProSn:   d.DeviceProSn,
 			DeviceModel:   d.DeviceModel,
-			DeviceModelID: d.DeviceModelId,
+			DeviceModelId: d.DeviceModelId,
 			DeviceName:    d.DeviceName,
 			DeviceState:   d.DeviceState,
 			DevStatus:     d.DevStatus,
@@ -153,14 +153,14 @@ func (e *EndPoint) GetDevicesTable() output.Table {
 		// for _, d := range e.Response.ResultData.PageList {
 		// 	_ = table.AddRow(
 		// 		d.PsKey.Value(),
-		// 		d.PsID.Value(),
+		// 		d.PsId.Value(),
 		// 		d.DeviceType.Value(),
 		// 		d.DeviceCode.Value(),
 		// 		d.ChannelId.Value(),
 		// 		d.TypeName.Value(),
 		// 		d.DeviceProSn.Value(),
 		// 		d.DeviceModel.Value(),
-		// 		d.DeviceModelID.Value(),
+		// 		d.DeviceModelId.Value(),
 		// 		d.DeviceName.Value(),
 		// 		d.DeviceState,
 		// 		d.DevStatus,
@@ -200,14 +200,14 @@ func GetDevicesTable(data Devices) output.Table {
 		// for _, d := range e.Response.ResultData.PageList {
 		// 	_ = table.AddRow(
 		// 		d.PsKey.Value(),
-		// 		d.PsID.Value(),
+		// 		d.PsId.Value(),
 		// 		d.DeviceType.Value(),
 		// 		d.DeviceCode.Value(),
 		// 		d.ChannelId.Value(),
 		// 		d.TypeName.Value(),
 		// 		d.DeviceProSn.Value(),
 		// 		d.DeviceModel.Value(),
-		// 		d.DeviceModelID.Value(),
+		// 		d.DeviceModelId.Value(),
 		// 		d.DeviceName.Value(),
 		// 		d.DeviceState,
 		// 		d.DevStatus,
@@ -247,7 +247,7 @@ func GetDevicesTable(data Devices) output.Table {
 				d.TypeName.Value(),
 				d.DeviceProSn.Value(),
 				d.DeviceModel.Value(),
-				d.DeviceModelID.Value(),
+				d.DeviceModelId.Value(),
 				d.DeviceName.Value(),
 				d.DeviceState,
 				d.DevStatus,

diff --git a/iSolarCloud/AppService/getDeviceModelInfoList/data.go b/iSolarCloud/AppService/getDeviceModelInfoList/data.go
@@ -3,8 +3,8 @@ package getDeviceModelInfoList
 import (
 	"GoSungrow/iSolarCloud/api"
 	"GoSungrow/iSolarCloud/api/apiReflect"
-	"GoSungrow/iSolarCloud/api/valueTypes"
 	"GoSungrow/iSolarCloud/api/output"
+	"GoSungrow/iSolarCloud/api/valueTypes"
 	"fmt"
 	"github.com/MickMake/GoUnify/Only"
 )
@@ -27,11 +27,11 @@ func (rd RequestData) Help() string {
 
 type ResultData []struct {
 	ComType           string `json:"com_type"`
-	DeviceFactoryID   string `json:"device_factory_id"`
+	DeviceFactoryId   string `json:"device_factory_id"`
 	DeviceFactoryName string `json:"device_factory_name"`
 	DeviceModel       string `json:"device_model"`
 	DeviceModelCode   string `json:"device_model_code"`
-	DeviceModelID     valueTypes.Integer  `json:"device_model_id"`
+	DeviceModelId     valueTypes.Integer  `json:"device_model_id"`
 	DeviceType        valueTypes.Integer  `json:"device_type"`
 	IsRemoteUpgrade   valueTypes.Bool     `json:"is_remote_upgrade"`
 }
@@ -89,10 +89,10 @@ func (e *EndPoint) GetPointDataTable() output.Table {
 				d.DeviceModelCode = ""
 			}
 			_ = table.AddRow(
-				d.DeviceModelID,
+				d.DeviceModelId,
 				d.DeviceType,
 				d.ComType,
-				d.DeviceFactoryID,
+				d.DeviceFactoryId,
 				d.DeviceFactoryName,
 				d.DeviceModel,
 				d.DeviceModelCode,

diff --git a/iSolarCloud/AppService/getDeviceTypeList/data.go b/iSolarCloud/AppService/getDeviceTypeList/data.go
@@ -25,7 +25,7 @@ func (rd RequestData) Help() string {
 
 type ResultData struct {
 	DeviceTypeList []struct {
-		DevListOrderID valueTypes.Integer  `json:"dev_list_order_id"`
+		DevListOrderId valueTypes.Integer  `json:"dev_list_order_id"`
 		DeviceType     valueTypes.Integer  `json:"device_type"`
 		TypeName       valueTypes.String   `json:"type_name"`
 	} `json:"deviceTypeList"`

diff --git a/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go b/iSolarCloud/AppService/getFaultMsgListWithYYYYMM/data.go
@@ -32,8 +32,8 @@ type ResultData   []struct {
 	FaultReason   valueTypes.String   `json:"fault_reason"`
 	FaultType     valueTypes.Integer  `json:"fault_type"`
 	FaultTypeCode valueTypes.Integer  `json:"fault_type_code"`
-	ID            valueTypes.Integer  `json:"id"`
-	PsID          valueTypes.Integer  `json:"ps_id"`
+	Id            valueTypes.Integer  `json:"id"`
+	PsId          valueTypes.PsId  `json:"ps_id"`
 	PsKey         valueTypes.PsKey    `json:"ps_key"`
 	UUID          valueTypes.Integer  `json:"uuid"`
 }

diff --git a/iSolarCloud/AppService/getHistoryInfo/data.go b/iSolarCloud/AppService/getHistoryInfo/data.go
@@ -14,7 +14,7 @@ const Disabled = false
 
 type RequestData struct {
 	DateType string `json:"date_type" required:"true"`
-	DateID   string `json:"date_id" required:"true"`
+	DateId   string `json:"date_id" required:"true"`
 }
 
 func (rd RequestData) IsValid() error {